Use new running scripts in ci-perf-kit (#1005)

This PR updates to ci-perf-kit 0.7.0. It fixes a few issues: * Use new running scripts: #980 * Run all the benchmarks for all the plans: #981 * Perf comparison for PR works again: #906
mmtk · Nov 3, 2023 · dad49c2 · dad49c2
1 parent 39d2371
commit dad49c2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/micro-bm.yml b/.github/workflows/micro-bm.yml
@@ -66,7 +66,7 @@ jobs:
         with:
           repository: mmtk/ci-perf-kit
           token: ${{ secrets.GITHUB_TOKEN }}
-          ref: "0.6.8"
+          ref: "0.7.0"
           path: ci-perf-kit
           submodules: true
       # Use rust-toolchain in the trunk (it doesnt matter much - if the toolchains defined in the trunk and the branch are different, we cant run anyway)

diff --git a/.github/workflows/perf-baseline.yml b/.github/workflows/perf-baseline.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           token: ${{ secrets.CI_ACCESS_TOKEN }}
           repository: mmtk/ci-perf-kit
-          ref: "0.6.10"
+          ref: "0.7.0"
           path: ci-perf-kit
           submodules: true
       # setup
@@ -79,7 +79,7 @@ jobs:
         with:
           token: ${{ secrets.CI_ACCESS_TOKEN }}
           repository: mmtk/ci-perf-kit
-          ref: "0.6.10"
+          ref: "0.7.0"
           path: ci-perf-kit
           submodules: true
       # setup

diff --git a/.github/workflows/perf-compare-ci.yml b/.github/workflows/perf-compare-ci.yml
@@ -63,6 +63,7 @@ jobs:
     jikesrvm-perf-compare:
         runs-on: [self-hosted, Linux, freq-scaling-off]
         needs: [binding-refs, mmtk-refs]
+        timeout-minutes: 1440
         steps:
           # Trunk - we always use master from the mmtk org
           # - binding
@@ -106,7 +107,7 @@ jobs:
             with:
               repository: mmtk/ci-perf-kit
               token: ${{ secrets.CI_ACCESS_TOKEN }}
-              ref: "0.6.8"
+              ref: "0.7.0"
               path: ci-perf-kit
               submodules: true
           # setup
@@ -129,7 +130,7 @@ jobs:
           - name: Compare Performance
             id: run
             run: |
-              JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 ./ci-perf-kit/scripts/jikesrvm-compare.sh mmtk-jikesrvm-trunk/ mmtk-core-trunk/ mmtk-jikesrvm-branch/ mmtk-core-branch/ jikesrvm-compare-report.md
+              JAVA_HOME=/opt/jdk1.6.0_45/ PATH=/opt/apache-ant-1.9.16/bin/:/opt/jdk1.6.0_45/bin/:$PATH ./ci-perf-kit/scripts/jikesrvm-compare.sh mmtk-jikesrvm-trunk/ mmtk-core-trunk/ mmtk-jikesrvm-branch/ mmtk-core-branch/ jikesrvm-compare-report.md
           # set report.md to output
           - uses: pCYSl5EDgo/cat@master
             id: cat
@@ -165,6 +166,7 @@ jobs:
     openjdk-perf-compare:
         runs-on: [self-hosted, Linux, freq-scaling-off]
         needs: [binding-refs, mmtk-refs]
+        timeout-minutes: 1440
         steps:
             # Trunk - we always use master from the mmtk org
             # - binding
@@ -208,7 +210,7 @@ jobs:
               with:
                 repository: mmtk/ci-perf-kit
                 token: ${{ secrets.CI_ACCESS_TOKEN }}
-                ref: "0.6.8"
+                ref: "0.7.0"
                 path: ci-perf-kit
                 submodules: true
             # setup

diff --git a/.github/workflows/perf-regression-ci.yml b/.github/workflows/perf-regression-ci.yml
@@ -22,6 +22,7 @@ jobs:
   # JikesRVM
   jikesrvm-perf-regression:
     runs-on: [self-hosted, Linux, freq-scaling-off]
+    timeout-minutes: 1440
     steps:
       - name: Checkout MMTk Core
         uses: actions/checkout@v2
@@ -41,7 +42,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: mmtk/ci-perf-kit
-          ref: "0.6.10"
+          ref: "0.7.0"
           path: ci-perf-kit
           token: ${{ secrets.CI_ACCESS_TOKEN }}
           submodules: true
@@ -82,6 +83,7 @@ jobs:
   # OpenJDK
   openjdk-perf-regression:
     runs-on: [self-hosted, Linux, freq-scaling-off]
+    timeout-minutes: 1440
     steps:
       - name: Checkout MMTk Core
         uses: actions/checkout@v2
@@ -101,7 +103,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: mmtk/ci-perf-kit
-          ref: "0.6.10"
+          ref: "0.7.0"
           path: ci-perf-kit
           token: ${{ secrets.CI_ACCESS_TOKEN }}
           submodules: true
@@ -146,6 +148,7 @@ jobs:
 
   openjdk-mutator-perf:
     runs-on: [self-hosted, Linux, freq-scaling-off]
+    timeout-minutes: 1440
     steps:
       - name: Checkout MMTk Core
         uses: actions/checkout@v2
@@ -165,7 +168,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: mmtk/ci-perf-kit
-          ref: "0.6.10"
+          ref: "0.7.0"
           path: ci-perf-kit
           token: ${{ secrets.CI_ACCESS_TOKEN }}
           submodules: true