diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index efb27298a..2fe0647a6 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -640,15 +640,15 @@ jobs: make -j$(nproc) benchmarks cd .. make -C test/data - - name: Checkout Master Branch + - name: Checkout Base Branch uses: actions/checkout@v3 with: - ref: master - path: master - - name: Build Master Branch + ref: ${{ github.event.pull_request.base.ref }} + path: base + - name: Build Base Branch run: | - mkdir master/build - cd master/build + mkdir base/build + cd base/build cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. make -j$(nproc) make -j$(nproc) benchmarks @@ -656,11 +656,11 @@ jobs: make -C test/data - name: Run Benchmarks run: | - ./scripts/ci/run_benchmarks.sh master pr + ./pr/scripts/ci/run_benchmarks.sh base pr - name: Compare Benchmarks run: | cat pr_results/match_mld.bench - cat master_results/match_mld.bench + cat base_results/match_mld.bench - name: Post Benchmark Results run: | - python3 pr/scripts/ci/post_benchmark_results.py master_results pr_results + python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results diff --git a/scripts/ci/run_benchmarks.sh b/scripts/ci/run_benchmarks.sh index 88e2046dc..5d3b0e389 100755 --- a/scripts/ci/run_benchmarks.sh +++ b/scripts/ci/run_benchmarks.sh @@ -9,12 +9,14 @@ function run_benchmarks_for_folder { mkdir -p $RESULTS_FOLDER - ./$FOLDER/build/src/benchmarks/match-bench "./$FOLDER/test/data/mld/monaco.osrm" mld > "$RESULTS_FOLDER/match_mld.bench" - ./$FOLDER/build/src/benchmarks/match-bench "./$FOLDER/test/data/ch/monaco.osrm" > "$RESULTS_FOLDER/match_ch.bench" - ./$FOLDER/build/src/benchmarks/alias-bench > "$RESULTS_FOLDER/alias.bench" - ./$FOLDER/build/src/benchmarks/json-render-bench "./$FOLDER/src/benchmarks/portugal_to_korea.json" > "$RESULTS_FOLDER/json-render.bench" - ./$FOLDER/build/src/benchmarks/packedvector-bench > "$RESULTS_FOLDER/packedvector.bench" - ./$FOLDER/build/src/benchmarks/rtree-bench "./$FOLDER/test/data/monaco.osrm.ramIndex" "./$FOLDER/test/data/monaco.osrm.fileIndex" "./$FOLDER/test/data/monaco.osrm.nbg_nodes" > "$RESULTS_FOLDER/rtree.bench" + BENCHMARKS_FOLDER="$FOLDER/build/src/benchmarks" + + ./$BENCHMARKS_FOLDER/match-bench "./$FOLDER/test/data/mld/monaco.osrm" mld > "$RESULTS_FOLDER/match_mld.bench" + ./$BENCHMARKS_FOLDER/match-bench "./$FOLDER/test/data/ch/monaco.osrm" > "$RESULTS_FOLDER/match_ch.bench" + ./$BENCHMARKS_FOLDER/alias-bench > "$RESULTS_FOLDER/alias.bench" + ./$BENCHMARKS_FOLDER/json-render-bench "./$FOLDER/src/benchmarks/portugal_to_korea.json" > "$RESULTS_FOLDER/json-render.bench" + ./$BENCHMARKS_FOLDER/packedvector-bench > "$RESULTS_FOLDER/packedvector.bench" + ./$BENCHMARKS_FOLDER/rtree-bench "./$FOLDER/test/data/monaco.osrm.ramIndex" "./$FOLDER/test/data/monaco.osrm.fileIndex" "./$FOLDER/test/data/monaco.osrm.nbg_nodes" > "$RESULTS_FOLDER/rtree.bench" } run_benchmarks_for_folder $1 "${1}_results"