Revert "CI: Benchmark x86_64-based EC2 instances using PMU instead of…

… PERF" This reverts commit b629f9c.
pq-code-package · Nov 17, 2024 · d084943 · d084943
1 parent b9dc283
commit d084943
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -72,43 +72,36 @@ jobs:
             ec2_ami: ubuntu-latest (aarch64)
             archflags: -mcpu=cortex-a76 -march=armv8.2-a
             cflags: -DFORCE_AARCH64
-            perf: PERF
           - name: Graviton3
             ec2_instance_type: c7g.medium
             ec2_ami: ubuntu-latest (aarch64)
             archflags: -march=armv8.4-a+sha3
             cflags: -DFORCE_AARCH64
-            perf: PERF
           - name: Graviton4
             ec2_instance_type: c8g.medium
             ec2_ami: ubuntu-latest (aarch64)
             archflags: -march=armv9-a+sha3
             cflags: -DFORCE_AARCH64
-            perf: PERF
           - name: AMD EPYC 4th gen (c7a)
             ec2_instance_type: c7a.medium
             ec2_ami: ubuntu-latest (x86_64)
             archflags: -mavx2 -mbmi2 -mpopcnt -maes
             cflags: -DFORCE_X86_64
-            perf: PMU
           - name: Intel Xeon 4th gen (c7i)
             ec2_instance_type: c7i.large
             ec2_ami: ubuntu-latest (x86_64)
             archflags: -mavx2 -mbmi2 -mpopcnt -maes
             cflags: -DFORCE_X86_64
-            perf: PMU
           - name: AMD EPYC 3rd gen (c6a)
             ec2_instance_type: c7a.medium
             ec2_ami: ubuntu-latest (x86_64)
             archflags: -mavx2 -mbmi2 -mpopcnt -maes
             cflags: -DFORCE_X86_64
-            perf: PMU
           - name: Intel Xeon 3rd gen (c6i)
             ec2_instance_type: c7i.large
             ec2_ami: ubuntu-latest (x86_64)
             archflags: -mavx2 -mbmi2 -mpopcnt -maes
             cflags: -DFORCE_X86_64
-            perf: PMU
     uses: ./.github/workflows/bench_ec2_reusable.yml
     if: github.repository_owner == 'pq-code-package' && (github.event.label.name == 'benchmark' || github.ref == 'refs/heads/main')
     with:
@@ -119,5 +112,4 @@ jobs:
       opt: ${{ matrix.opt.value }}
       store_results: true
       name: "${{ matrix.target.name }}${{ (!matrix.opt.value && ' (no-opt)') || ''}}"
-      perf: ${{ matrix.target.perf }}
     secrets: inherit
diff --git a/.github/workflows/bench_ec2_reusable.yml b/.github/workflows/bench_ec2_reusable.yml
@@ -34,10 +34,6 @@ on:
         type: boolean
         description: Runs with optimized code if enabled.
         default: true
-      perf:
-        type: string
-        description: Method by which clock cycles should be measured (PMU | PERF)
-        default: PERF
       store_results:
         type: boolean
         description: Indicates if results should be pushed to github pages
@@ -125,7 +121,7 @@ jobs:
           cflags: ${{ inputs.cflags }}
           archflags: ${{ inputs.archflags }}
           opt: ${{ inputs.opt }}
-          perf: ${{ inputs.perf }}
+          perf: PERF
           store_results: ${{ inputs.store_results }}
           bench_extra_args: ${{ inputs.bench_extra_args }}
           gh_token: ${{ secrets.AWS_GITHUB_TOKEN }}
@@ -152,7 +148,7 @@ jobs:
           cflags: ${{ inputs.cflags }}
           archflags: ${{ inputs.archflags }}
           opt: ${{ inputs.opt }}
-          perf: ${{ inputs.perf }}
+          perf: PERF
           store_results: ${{ inputs.store_results }}
           bench_extra_args: ${{ inputs.bench_extra_args }}
           gh_token: ${{ secrets.AWS_GITHUB_TOKEN }}