mirror of
https://github.com/ROCm/composable_kernel.git
synced 2026-05-12 17:26:00 +00:00
7d6c8e5afa
[CK] [CK Tile] Improved ci_safety_check in smart-build infrastructure (#6215) ## Motivation The two-dot syntax (origin/develop..HEAD) is more conservative and catches a broader set of changes when PRs merge develop branch. While three-dot syntax shows only PR-specific changes, two-dot ensures we don't miss any files that differ between develop and the PR branch, including files modified in both the PR and merged develop commits. This conservative approach prioritizes catching all potential issues over CI efficiency, which is appropriate for build system change detection. # Technical Details: - Switched to two-dot (..) syntax in ci_safety_check.sh - Update comments to clarify the intentional use of two-dot syntax - Maintain consistency across both CHANGE_ID branches - Trigger full build when any of the following changes - `Dockerfile|Jenkinsfile|CMakePresets\.json|script/dependency-parser/` ## Test Plan Tested with PR 6200 which has multiple merge-commits. ## Test Result It detects 43 new tests compared to 3-dot scheme. ## Submission Checklist - [x ] Look over the contributing guidelines at https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.
373 lines
12 KiB
Bash
Executable File
373 lines
12 KiB
Bash
Executable File
#!/bin/bash
|
|
# Validate Smart Build vs Legacy Method for a PR
|
|
#
|
|
# This script compares smart build and legacy dependency analysis
|
|
# to ensure both methods produce the same test selection results.
|
|
|
|
set -e
|
|
|
|
# Colors for output
|
|
GREEN='\033[0;32m'
|
|
YELLOW='\033[1;33m'
|
|
RED='\033[0;31m'
|
|
BLUE='\033[0;34m'
|
|
NC='\033[0m' # No Color
|
|
|
|
# Configuration
|
|
PR_NUMBER=""
|
|
BASE_BRANCH="origin/develop"
|
|
SMART_BUILD_BRANCH="users/yraparti/ck/dependency-parser-smart-build"
|
|
BUILD_DIR="../../build"
|
|
SKIP_BUILD=false
|
|
SKIP_LEGACY=false
|
|
|
|
print_help() {
|
|
cat << 'HELP'
|
|
Usage: validate_pr.sh -p PR_NUMBER [OPTIONS]
|
|
|
|
Validates that smart build and legacy methods select the same tests for a PR.
|
|
|
|
Required:
|
|
-p, --pr PR_NUMBER PR number to validate
|
|
|
|
Options:
|
|
-b, --base BRANCH Base branch (default: origin/develop)
|
|
-s, --smart-build BRANCH Smart build branch (default: users/yraparti/ck/dependency-parser-smart-build)
|
|
--skip-build Skip full build (use existing build artifacts)
|
|
--skip-legacy Skip legacy analysis (only run smart build)
|
|
-h, --help Show this help
|
|
|
|
Examples:
|
|
# Validate PR 5324
|
|
./validate_pr.sh -p 5324
|
|
|
|
# Validate PR 5168 with custom base
|
|
./validate_pr.sh -p 5168 -b origin/main
|
|
|
|
# Quick validation (skip build, only smart build)
|
|
./validate_pr.sh -p 5324 --skip-build --skip-legacy
|
|
|
|
Output:
|
|
Results saved to build/prXXXX_validation_results.txt
|
|
HELP
|
|
}
|
|
|
|
log_info() {
|
|
echo -e "${GREEN}[INFO]${NC} $1"
|
|
}
|
|
|
|
log_warn() {
|
|
echo -e "${YELLOW}[WARN]${NC} $1"
|
|
}
|
|
|
|
log_error() {
|
|
echo -e "${RED}[ERROR]${NC} $1"
|
|
}
|
|
|
|
log_section() {
|
|
echo -e "\n${BLUE}=== $1 ===${NC}\n"
|
|
}
|
|
|
|
# Parse arguments
|
|
while [[ $# -gt 0 ]]; do
|
|
case $1 in
|
|
-p|--pr)
|
|
PR_NUMBER="$2"
|
|
shift 2
|
|
;;
|
|
-b|--base)
|
|
BASE_BRANCH="$2"
|
|
shift 2
|
|
;;
|
|
-s|--smart-build)
|
|
SMART_BUILD_BRANCH="$2"
|
|
shift 2
|
|
;;
|
|
--skip-build)
|
|
SKIP_BUILD=true
|
|
shift
|
|
;;
|
|
--skip-legacy)
|
|
SKIP_LEGACY=true
|
|
shift
|
|
;;
|
|
-h|--help)
|
|
print_help
|
|
exit 0
|
|
;;
|
|
*)
|
|
log_error "Unknown option: $1"
|
|
print_help
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
# Validate inputs
|
|
if [ -z "$PR_NUMBER" ]; then
|
|
log_error "PR number is required"
|
|
print_help
|
|
exit 1
|
|
fi
|
|
|
|
# Setup
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
|
BUILD_DIR="$PROJECT_ROOT/build"
|
|
OUTPUT_FILE="$BUILD_DIR/pr${PR_NUMBER}_validation_results.txt"
|
|
|
|
log_section "Validation Configuration"
|
|
echo "PR Number: $PR_NUMBER"
|
|
echo "Base Branch: $BASE_BRANCH"
|
|
echo "Smart Build Branch: $SMART_BUILD_BRANCH"
|
|
echo "Skip Build: $SKIP_BUILD"
|
|
echo "Skip Legacy: $SKIP_LEGACY"
|
|
echo "Output File: $OUTPUT_FILE"
|
|
|
|
# Start validation log
|
|
exec > >(tee "$OUTPUT_FILE") 2>&1
|
|
|
|
log_section "Step 1: Fetch PR $PR_NUMBER"
|
|
cd "$PROJECT_ROOT" || exit 1
|
|
|
|
log_info "Fetching PR #$PR_NUMBER..."
|
|
git fetch origin pull/${PR_NUMBER}/head:pr-${PR_NUMBER}
|
|
|
|
log_info "Checking out PR branch..."
|
|
git checkout pr-${PR_NUMBER}
|
|
|
|
log_info "PR commit:"
|
|
git log --oneline -1
|
|
|
|
log_section "Step 2: Rebase on Smart Build Branch"
|
|
log_info "Rebasing pr-${PR_NUMBER} on $SMART_BUILD_BRANCH..."
|
|
|
|
# Attempt rebase, handling conflicts by accepting PR changes
|
|
if ! git rebase $SMART_BUILD_BRANCH; then
|
|
log_warn "Rebase conflicts detected, resolving by accepting PR changes..."
|
|
|
|
# Loop to handle multiple conflicts during rebase
|
|
while true; do
|
|
# Get list of conflicted files
|
|
CONFLICTED_FILES=$(git diff --name-only --diff-filter=U)
|
|
|
|
if [ -z "$CONFLICTED_FILES" ]; then
|
|
log_info "No more conflicts, rebase complete"
|
|
break
|
|
fi
|
|
|
|
log_info "Conflicted files:"
|
|
echo "$CONFLICTED_FILES"
|
|
|
|
# For each conflicted file, accept the PR's version (theirs)
|
|
while IFS= read -r file; do
|
|
if [ -f "$file" ]; then
|
|
log_info "Accepting PR changes for: $file"
|
|
git checkout --theirs "$file"
|
|
git add "$file"
|
|
fi
|
|
done <<< "$CONFLICTED_FILES"
|
|
|
|
# Continue the rebase
|
|
log_info "Continuing rebase..."
|
|
if git -c core.editor=true rebase --continue 2>&1 | grep -q "No changes"; then
|
|
log_warn "No changes after conflict resolution, skipping commit"
|
|
git rebase --skip
|
|
elif git rebase --show-current-patch &>/dev/null; then
|
|
# Still in rebase, continue loop
|
|
continue
|
|
else
|
|
# Rebase complete
|
|
log_info "Rebase completed"
|
|
break
|
|
fi
|
|
done
|
|
fi
|
|
|
|
log_info "Rebased commits:"
|
|
git log --oneline -5
|
|
|
|
log_section "Step 3: Analyze Changed Files"
|
|
log_info "Files changed vs $BASE_BRANCH:"
|
|
CHANGED_FILES=$(git diff --name-only ${BASE_BRANCH}..HEAD -- projects/composablekernel)
|
|
NUM_FILES=$(echo "$CHANGED_FILES" | wc -l)
|
|
echo "$CHANGED_FILES" | head -20
|
|
if [ "$NUM_FILES" -gt 20 ]; then
|
|
echo "... (showing first 20 of $NUM_FILES files)"
|
|
fi
|
|
echo ""
|
|
echo "Total changed files: $NUM_FILES"
|
|
|
|
log_section "Step 4: Generate Fresh Dependency Map"
|
|
cd "$BUILD_DIR" || exit 1
|
|
|
|
log_info "Configuring CMake to generate compile_commands.json..."
|
|
cmake .. -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON 2>&1 | grep -v "^-- " || true
|
|
|
|
if [ ! -f "compile_commands.json" ]; then
|
|
log_error "CMake configuration failed - compile_commands.json not generated"
|
|
exit 1
|
|
fi
|
|
|
|
if [ ! -f "build.ninja" ]; then
|
|
log_error "build.ninja not found - CMake should have generated it"
|
|
exit 1
|
|
fi
|
|
|
|
log_info "Generating fresh dependency map for PR validation..."
|
|
START_TIME=$(date +%s)
|
|
python3 ../script/dependency-parser/main.py cmake-parse \
|
|
compile_commands.json \
|
|
build.ninja \
|
|
--workspace-root .. \
|
|
--output enhanced_dependency_mapping.json
|
|
|
|
if [ ! -f "enhanced_dependency_mapping.json" ]; then
|
|
log_error "Dependency map generation failed"
|
|
exit 1
|
|
fi
|
|
|
|
END_TIME=$(date +%s)
|
|
DEP_TIME=$((END_TIME - START_TIME))
|
|
log_info "Dependency map generated in ${DEP_TIME} seconds"
|
|
|
|
SMART_MAP="enhanced_dependency_mapping.json"
|
|
SMART_FILES=$(jq '.file_to_executables | length' $SMART_MAP)
|
|
log_info "Dependency map tracks $SMART_FILES files"
|
|
|
|
log_section "Step 5: Smart Build Test Selection"
|
|
|
|
log_info "Running smart build test selection..."
|
|
python3 ../script/dependency-parser/main.py select \
|
|
"$SMART_MAP" \
|
|
$BASE_BRANCH \
|
|
HEAD \
|
|
--ctest-only \
|
|
--output pr${PR_NUMBER}_smart_build.json
|
|
|
|
SMART_TESTS=$(jq -r '.tests_to_run | length' pr${PR_NUMBER}_smart_build.json)
|
|
log_info "Smart build selected: $SMART_TESTS tests"
|
|
|
|
# Show statistics
|
|
echo ""
|
|
echo "Smart Build Results:"
|
|
jq '{changed_files: .changed_files | length, tests_selected: .tests_to_run | length, statistics}' pr${PR_NUMBER}_smart_build.json
|
|
|
|
if [ "$SKIP_LEGACY" = true ]; then
|
|
log_section "Validation Complete (Legacy Skipped)"
|
|
echo ""
|
|
echo "Smart Build: $SMART_TESTS tests selected"
|
|
echo "Legacy: Skipped"
|
|
exit 0
|
|
fi
|
|
|
|
log_section "Step 6: Full Build (for Legacy Method)"
|
|
if [ "$SKIP_BUILD" = true ]; then
|
|
log_warn "Skipping build (--skip-build specified)"
|
|
log_info "Using existing build artifacts..."
|
|
else
|
|
log_info "Running full build (this takes ~60 minutes)..."
|
|
START_TIME=$(date +%s)
|
|
|
|
if ninja 2>&1 | tee pr${PR_NUMBER}_build.log; then
|
|
END_TIME=$(date +%s)
|
|
BUILD_TIME=$((END_TIME - START_TIME))
|
|
log_info "Build completed in $((BUILD_TIME / 60)) minutes"
|
|
else
|
|
log_error "Build failed. Check pr${PR_NUMBER}_build.log for details."
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
log_section "Step 7: Legacy Dependency Analysis"
|
|
log_info "Generating legacy dependency map (ninja -t deps)..."
|
|
python3 ../script/dependency-parser/main.py parse build.ninja
|
|
|
|
if [ ! -f "enhanced_dependency_mapping.json" ]; then
|
|
log_error "Legacy dependency map generation failed"
|
|
exit 1
|
|
fi
|
|
|
|
LEGACY_FILES=$(jq '.file_to_executables | length' enhanced_dependency_mapping.json)
|
|
log_info "Legacy map tracks $LEGACY_FILES files"
|
|
|
|
log_section "Step 8: Legacy Test Selection"
|
|
log_info "Running legacy test selection..."
|
|
python3 ../script/dependency-parser/main.py select \
|
|
enhanced_dependency_mapping.json \
|
|
$BASE_BRANCH \
|
|
HEAD \
|
|
--ctest-only \
|
|
--output pr${PR_NUMBER}_legacy_tests.json
|
|
|
|
LEGACY_TESTS=$(jq -r '.tests_to_run | length' pr${PR_NUMBER}_legacy_tests.json)
|
|
log_info "Legacy method selected: $LEGACY_TESTS tests"
|
|
|
|
# Show statistics
|
|
echo ""
|
|
echo "Legacy Method Results:"
|
|
jq '{changed_files: .changed_files | length, tests_selected: .tests_to_run | length, statistics}' pr${PR_NUMBER}_legacy_tests.json
|
|
|
|
log_section "Step 9: Compare Results"
|
|
echo ""
|
|
echo "╔════════════════════════════════════════════════════════════════╗"
|
|
echo "║ VALIDATION RESULTS ║"
|
|
echo "╠════════════════════════════════════════════════════════════════╣"
|
|
echo "║ PR Number: #${PR_NUMBER} "
|
|
echo "║ Changed Files: $NUM_FILES "
|
|
echo "║ Smart Build Tests: $SMART_TESTS "
|
|
echo "║ Legacy Tests: $LEGACY_TESTS "
|
|
echo "╠════════════════════════════════════════════════════════════════╣"
|
|
|
|
if [ "$SMART_TESTS" -eq "$LEGACY_TESTS" ]; then
|
|
echo "║ Result: ✅ MATCH "
|
|
echo "╚════════════════════════════════════════════════════════════════╝"
|
|
echo ""
|
|
log_info "VALIDATION PASSED: Both methods selected $SMART_TESTS tests"
|
|
|
|
# Detailed comparison
|
|
if [ "$SMART_TESTS" -gt 0 ]; then
|
|
log_info "Comparing test lists..."
|
|
SMART_LIST=$(jq -r '.tests_to_run | sort | .[]' pr${PR_NUMBER}_smart_build.json)
|
|
LEGACY_LIST=$(jq -r '.tests_to_run | sort | .[]' pr${PR_NUMBER}_legacy_tests.json)
|
|
|
|
if [ "$SMART_LIST" = "$LEGACY_LIST" ]; then
|
|
log_info "Test lists are identical ✓"
|
|
else
|
|
log_warn "Test counts match but lists differ!"
|
|
diff <(echo "$SMART_LIST") <(echo "$LEGACY_LIST") || true
|
|
fi
|
|
fi
|
|
|
|
EXIT_CODE=0
|
|
else
|
|
echo "║ Result: ❌ MISMATCH "
|
|
echo "╚════════════════════════════════════════════════════════════════╝"
|
|
echo ""
|
|
log_error "VALIDATION FAILED: Smart build selected $SMART_TESTS tests, Legacy selected $LEGACY_TESTS tests"
|
|
|
|
# Show differences
|
|
log_warn "Analyzing differences..."
|
|
|
|
SMART_ONLY=$(comm -23 <(jq -r '.tests_to_run | sort | .[]' pr${PR_NUMBER}_smart_build.json) \
|
|
<(jq -r '.tests_to_run | sort | .[]' pr${PR_NUMBER}_legacy_tests.json) | wc -l)
|
|
LEGACY_ONLY=$(comm -13 <(jq -r '.tests_to_run | sort | .[]' pr${PR_NUMBER}_smart_build.json) \
|
|
<(jq -r '.tests_to_run | sort | .[]' pr${PR_NUMBER}_legacy_tests.json) | wc -l)
|
|
|
|
echo "Tests only in smart build: $SMART_ONLY"
|
|
echo "Tests only in legacy: $LEGACY_ONLY"
|
|
|
|
EXIT_CODE=1
|
|
fi
|
|
|
|
log_section "Summary"
|
|
echo "Validation complete for PR #$PR_NUMBER"
|
|
echo "Results saved to: $OUTPUT_FILE"
|
|
echo ""
|
|
echo "Smart build JSON: pr${PR_NUMBER}_smart_build.json"
|
|
if [ "$SKIP_LEGACY" = false ]; then
|
|
echo "Legacy JSON: pr${PR_NUMBER}_legacy_tests.json"
|
|
fi
|
|
|
|
exit $EXIT_CODE
|