From 64fca1a3f4521116b1242dd775d3188f6b08fcfe Mon Sep 17 00:00:00 2001 From: Arjun Yogidas Date: Mon, 7 Aug 2023 20:29:18 +0000 Subject: [PATCH 1/5] Add regression check automation This commit adds benchmark_regression_test.yml workflow that runs a regression test by comparing the benchmark results of the current branch with the previous benchmark results of the code in main branch. Signed-off-by: Arjun Raja Yogidas --- .../workflows/benchmark_regression_test.yml | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 .github/workflows/benchmark_regression_test.yml diff --git a/.github/workflows/benchmark_regression_test.yml b/.github/workflows/benchmark_regression_test.yml new file mode 100644 index 000000000..379dee060 --- /dev/null +++ b/.github/workflows/benchmark_regression_test.yml @@ -0,0 +1,68 @@ +name: Benchmark Regression Check + +on: + pull_request: + branches: [ main ] + paths: + - '**.go' + - 'go.*' + - 'cmd/go.*' + - 'Makefile' + - 'Dockerfile' + - 'integration/**' + - 'scripts/**' + - '.github/workflows/**' + +jobs: + benchmark-and-fetch-previous-results_and_compare: + name: Run Benchmark on current Branch + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v4 + with: + go-version: '1.18.10' + - run: make + - name: Run benchmark + run: make benchmarks-perf-test + - name: Make previous directory + run: mkdir -v ${{ github.workspace }}/previous + - name: Download previous run artifact + id: download-artifact + uses: dawidd6/action-download-artifact@v2 + with: + github_token: ${{secrets.GITHUB_TOKEN}} + name: benchmark-result-artifact + name_is_regexp: true + path: ${{ github.workspace }}/previous + repo: ${{ github.repository }} + check_artifacts: false + search_artifacts: true + skip_unpack: false + if_no_artifact_found: fail + workflow: benchmark_visualization.yml + - name: Perform Comparison and log results + id: run-compare + run: | + sudo chmod +x ${{ github.workspace }}/scripts/check_regression.sh + if sudo ${{ github.workspace }}/scripts/check_regression.sh ${{ github.workspace }}/previous/benchmark-result-artifact/results.json ${{github.workspace}}/benchmark/performanceTest/output/results.json; then + echo "Comparison successful. All P90 values are within the acceptable range." + else + echo "Comparison failed. Current P90 values exceed 110% of the corresponding past values." + echo "regression-detected=true" >> $GITHUB_OUTPUT + fi + - name: Stop the workflow if regression is detected + if: steps.run-compare.outputs.regression-detected == 'true' + uses: actions/github-script@v6 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const comment = ` + :warning: **Regression Detected** :warning: + + The benchmark comparison indicates that there has been a performance regression. + Please investigate and address the issue. + To Investigate check logs of the previous job above. + `; + + core.setFailed(comment); \ No newline at end of file From 32891caec5ba0ec8e7566ea355a0b31c094b2cfc Mon Sep 17 00:00:00 2001 From: Arjun Yogidas Date: Tue, 15 Aug 2023 18:23:08 +0000 Subject: [PATCH 2/5] Update workflow to run two benchmarks This commit is a test to check if running both the benchmarks in the same workflow would make any difference to the results Signed-off-by: Arjun Raja Yogidas --- .../workflows/benchmark_regression_test.yml | 45 +++++++++++-------- Makefile | 2 +- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/.github/workflows/benchmark_regression_test.yml b/.github/workflows/benchmark_regression_test.yml index 379dee060..4e5e62083 100644 --- a/.github/workflows/benchmark_regression_test.yml +++ b/.github/workflows/benchmark_regression_test.yml @@ -12,40 +12,47 @@ on: - 'integration/**' - 'scripts/**' - '.github/workflows/**' - + jobs: - benchmark-and-fetch-previous-results_and_compare: - name: Run Benchmark on current Branch + test-twice: runs-on: ubuntu-20.04 + steps: - - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: go-version: '1.18.10' + - name: Checkout main + uses: actions/checkout@v3 + with: + ref: main - run: make - name: Run benchmark - run: make benchmarks-perf-test + run: make benchmarks-perf-test - name: Make previous directory run: mkdir -v ${{ github.workspace }}/previous - - name: Download previous run artifact - id: download-artifact - uses: dawidd6/action-download-artifact@v2 + - name: Copy results to previous directory + run: cp -r ${{ github.workspace }}/benchmark/performanceTest/output ${{ github.workspace }}/previous + - name: Check out PR + uses: actions/checkout@v3 with: - github_token: ${{secrets.GITHUB_TOKEN}} - name: benchmark-result-artifact - name_is_regexp: true - path: ${{ github.workspace }}/previous - repo: ${{ github.repository }} - check_artifacts: false - search_artifacts: true - skip_unpack: false - if_no_artifact_found: fail - workflow: benchmark_visualization.yml + ref: ${{ github.event.pull_request.head.sha }} + - run: make + - name: Run benchmark + run: make benchmarks-perf-test + - name: Make current directory + run: mkdir -v ${{ github.workspace }}/current + - name: Stash uncommitted changes + run: git stash push --keep-index --include-untracked -m "Stashing changes for tests" + # If you're using Git version 2.28 or later, use this line instead: + # run: git stash push --keep-index --include-untracked -m "Stashing changes for tests" + # This will ensure that uncommitted changes do not interfere with the tests. + - name: Copy results to current directory + run: cp -r ${{ github.workspace }}/benchmark/performanceTest/output ${{ github.workspace }}/current - name: Perform Comparison and log results id: run-compare run: | sudo chmod +x ${{ github.workspace }}/scripts/check_regression.sh - if sudo ${{ github.workspace }}/scripts/check_regression.sh ${{ github.workspace }}/previous/benchmark-result-artifact/results.json ${{github.workspace}}/benchmark/performanceTest/output/results.json; then + if sudo ${{ github.workspace }}/scripts/check_regression.sh ${{ github.workspace }}/previous/results.json ${{github.workspace}}/current/results.json; then echo "Comparison successful. All P90 values are within the acceptable range." else echo "Comparison failed. Current P90 values exceed 110% of the corresponding past values." diff --git a/Makefile b/Makefile index ec32cac7f..e10fb90cd 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ build-benchmarks: benchmarks-perf-test: @echo "$@" - @cd benchmark/performanceTest ; sudo rm -rf output ; GO111MODULE=$(GO111MODULE_VALUE) go build -o ../bin/PerfTests . && sudo ../bin/PerfTests -show-commit + @cd benchmark/performanceTest ; sudo rm -rf output ; GO111MODULE=$(GO111MODULE_VALUE) go build -o ../bin/PerfTests . && sudo ../bin/PerfTests -show-commit -count 2 benchmarks-stargz: @echo "$@" From cda1c3ce86e59883476ac6bdf5a5c8f48d9559de Mon Sep 17 00:00:00 2001 From: Arjun Yogidas Date: Mon, 14 Aug 2023 22:50:03 +0000 Subject: [PATCH 3/5] Add some print statements to test Added print statements to test the benchmark results Signed-off-by: Arjun Raja Yogidas --- benchmark/framework/framework.go | 1 + benchmark/performanceTest/main.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmark/framework/framework.go b/benchmark/framework/framework.go index 28c3a7dd2..ae10bd422 100644 --- a/benchmark/framework/framework.go +++ b/benchmark/framework/framework.go @@ -94,6 +94,7 @@ func (frame *BenchmarkFramework) Run(ctx context.Context) { } } + print("should We add timeout here for testing?") json, err := json.MarshalIndent(frame, "", " ") if err != nil { fmt.Printf("JSON Marshalling Error: %v\n", err) diff --git a/benchmark/performanceTest/main.go b/benchmark/performanceTest/main.go index 83afc1011..1b54d444f 100644 --- a/benchmark/performanceTest/main.go +++ b/benchmark/performanceTest/main.go @@ -47,7 +47,6 @@ func main() { flag.BoolVar(&showCom, "show-commit", false, "tag the commit hash to the benchmark results") flag.IntVar(&numberOfTests, "count", 5, "Describes the number of runs a benchmarker should run. Default: 5") flag.StringVar(&configCsv, "f", "default", "Path to a csv file describing image details in this order ['Name','Image ref', 'Ready line', 'manifest ref'].") - flag.Parse() if showCom { From ae37c37e8e3133ca4ce135693ed5d91af50b26bd Mon Sep 17 00:00:00 2001 From: Arjun Yogidas Date: Mon, 14 Aug 2023 23:42:41 +0000 Subject: [PATCH 4/5] Add more log Commit test 4 Signed-off-by: Arjun Raja Yogidas --- benchmark/framework/framework.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/benchmark/framework/framework.go b/benchmark/framework/framework.go index ae10bd422..c449d23d2 100644 --- a/benchmark/framework/framework.go +++ b/benchmark/framework/framework.go @@ -129,6 +129,8 @@ func (testStats *BenchmarkTestStats) calculateTestStat() { fmt.Printf("Error Calculating Mean: %v\n", err) testStats.Mean = -1 } + + print("testStats.BenchmarkTimes: ", testStats.BenchmarkTimes) testStats.Min, err = stats.Min(testStats.BenchmarkTimes) if err != nil { fmt.Printf("Error Calculating Min: %v\n", err) From 9f473ef5098674c7ebb8ac64fe69d4f22da3fd0b Mon Sep 17 00:00:00 2001 From: Arjun Yogidas Date: Tue, 15 Aug 2023 18:23:08 +0000 Subject: [PATCH 5/5] Update workflow to run two benchmarks This commit is a test to check if running both the benchmarks in the same workflow would make any difference to the results Upload and download benchmarks Signed-off-by: Arjun Raja Yogidas --- .../workflows/benchmark_regression_test.yml | 99 ++++++++++++------- 1 file changed, 64 insertions(+), 35 deletions(-) diff --git a/.github/workflows/benchmark_regression_test.yml b/.github/workflows/benchmark_regression_test.yml index 4e5e62083..e49ead97b 100644 --- a/.github/workflows/benchmark_regression_test.yml +++ b/.github/workflows/benchmark_regression_test.yml @@ -28,10 +28,15 @@ jobs: - run: make - name: Run benchmark run: make benchmarks-perf-test - - name: Make previous directory - run: mkdir -v ${{ github.workspace }}/previous - - name: Copy results to previous directory - run: cp -r ${{ github.workspace }}/benchmark/performanceTest/output ${{ github.workspace }}/previous + - name: Upload latest benchmark result + uses: actions/upload-artifact@v3 + with: + name: benchmark-result-artifact-main + path: ${{github.workspace}}/benchmark/performanceTest/output/results.json + - name: remove output directory + run: sudo rm -rf ${{ github.workspace }}/benchmark/performanceTest/output + - name: Stash uncommitted changes + run: git stash push --keep-index --include-untracked -m "Stashing changes for tests" - name: Check out PR uses: actions/checkout@v3 with: @@ -39,37 +44,61 @@ jobs: - run: make - name: Run benchmark run: make benchmarks-perf-test - - name: Make current directory - run: mkdir -v ${{ github.workspace }}/current - - name: Stash uncommitted changes - run: git stash push --keep-index --include-untracked -m "Stashing changes for tests" - # If you're using Git version 2.28 or later, use this line instead: - # run: git stash push --keep-index --include-untracked -m "Stashing changes for tests" - # This will ensure that uncommitted changes do not interfere with the tests. - - name: Copy results to current directory - run: cp -r ${{ github.workspace }}/benchmark/performanceTest/output ${{ github.workspace }}/current - - name: Perform Comparison and log results - id: run-compare - run: | - sudo chmod +x ${{ github.workspace }}/scripts/check_regression.sh - if sudo ${{ github.workspace }}/scripts/check_regression.sh ${{ github.workspace }}/previous/results.json ${{github.workspace}}/current/results.json; then - echo "Comparison successful. All P90 values are within the acceptable range." - else - echo "Comparison failed. Current P90 values exceed 110% of the corresponding past values." - echo "regression-detected=true" >> $GITHUB_OUTPUT - fi - - name: Stop the workflow if regression is detected - if: steps.run-compare.outputs.regression-detected == 'true' - uses: actions/github-script@v6 + - name: Upload latest benchmark result + uses: actions/upload-artifact@v3 with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const comment = ` - :warning: **Regression Detected** :warning: + name: benchmark-result-artifact-pr + path: ${{github.workspace}}/benchmark/performanceTest/output/results.json + + download_and_perform_comparison: + runs-on: ubuntu-20.04 + needs: test-twice + steps: + - uses: actions/setup-go@v4 + with: + go-version: '1.18.10' + - name: Checkout main + uses: actions/checkout@v3 + with: + ref: main + - run: make + + - name: Create previous directory + run: mkdir -v ${{ github.workspace }}/previous + - name: Create current directory + run: mkdir -v ${{ github.workspace }}/current + - name: Download previous benchmark result + uses: actions/download-artifact@v3 + with: + name: benchmark-result-artifact-main + path: ${{github.workspace}}/previous + - name: Download current benchmark result + uses: actions/download-artifact@v3 + with: + name: benchmark-result-artifact-pr + path: ${{github.workspace}}/current + - name: Perform Comparison and log results + id: run-compare + run: | + sudo chmod +x ${{ github.workspace }}/scripts/check_regression.sh + if sudo ${{ github.workspace }}/scripts/check_regression.sh ${{ github.workspace }}/previous/results.json ${{github.workspace}}/current/results.json; then + echo "Comparison successful. All P90 values are within the acceptable range." + else + echo "Comparison failed. Current P90 values exceed 110% of the corresponding past values." + echo "regression-detected=true" >> $GITHUB_OUTPUT + fi + - name: Stop the workflow if regression is detected + if: steps.run-compare.outputs.regression-detected == 'true' + uses: actions/github-script@v6 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const comment = ` + :warning: **Regression Detected** :warning: - The benchmark comparison indicates that there has been a performance regression. - Please investigate and address the issue. - To Investigate check logs of the previous job above. - `; + The benchmark comparison indicates that there has been a performance regression. + Please investigate and address the issue. + To Investigate check logs of the previous job above. + `; - core.setFailed(comment); \ No newline at end of file + core.setFailed(comment); \ No newline at end of file