Update config options for real-time benchmark

Valgrind based instruction count is no longer available, but two debugging related options were recently added.

Author: kocsismate

.github/workflows/real-time-benchmark.yml

@@ -16,8 +16,16 @@ on:
         options:
           - "0"
           - "1"
-      instruction_count:
-        description: 'Whether Valgrind instruction count should be measured'
+      collect_extended_perf_stats:
+        description: 'Whether to collect extended perf stats as artifacts'
+        required: true
+        default: "0"
+        type: choice
+        options:
+          - "0"
+          - "1"
+      debug_environment:
+        description: 'Whether to collect environment debug logs as artifacts'
         required: true
         default: "0"
         type: choice
@@ -50,7 +58,8 @@ jobs:
       BASELINE_COMMIT: "d5f6e56610c729710073350af318c4ea1b292cfe"
       ID: "master"
       JIT: "1"
-      INSTRUCTION_COUNT: "0"
+      COLLECT_EXTENDED_PERF_STATS: "0"
+      DEBUG_ENVIRONMENT: "0"
       RUN_MICRO_BENCH: "0"
       YEAR: ""
     steps:
@@ -81,7 +90,8 @@ jobs:
             echo "ID=benchmarked" >> $GITHUB_ENV
 
             echo "JIT=${{ inputs.jit }}" >> $GITHUB_ENV
-            echo "INSTRUCTION_COUNT=${{ inputs.instruction_count }}" >> $GITHUB_ENV
+            echo "COLLECT_EXTENDED_PERF_STATS=${{ inputs.collect_extended_perf_stats }}" >> $GITHUB_ENV
+            echo "DEBUG_ENVIRONMENT=${{ inputs.debug_environment }}" >> $GITHUB_ENV
             echo "RUN_MICRO_BENCH=${{ inputs.run_micro_bench }}" >> $GITHUB_ENV
           fi
 
@@ -250,7 +260,8 @@ jobs:
           cp ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini.dist ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
           sed -i "s|INFRA_DOCKER_REGISTRY=public.ecr.aws/abcdefgh|INFRA_DOCKER_REGISTRY=${{ secrets.PHP_VERSION_BENCHMARK_DOCKER_REGISTRY }}|g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
           sed -i "s|INFRA_WORKSPACE=|INFRA_WORKSPACE=$WORKSPACE|g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
-          sed -i "s/INFRA_MEASURE_INSTRUCTION_COUNT=0/INFRA_MEASURE_INSTRUCTION_COUNT=${{ env.INSTRUCTION_COUNT }}/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+          sed -i "s/INFRA_COLLECT_EXTENDED_PERF_STATS=0/INFRA_COLLECT_EXTENDED_PERF_STATS=${{ env.COLLECT_EXTENDED_PERF_STATS }}/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
+          sed -i "s/INFRA_DEBUG_ENVIRONMENT=0/INFRA_DEBUG_ENVIRONMENT=${{ env.DEBUG_ENVIRONMENT }}/g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
 
           cp ./php-version-benchmarks/build/infrastructure/config/aws.tfvars.dist ./php-version-benchmarks/build/infrastructure/config/aws.tfvars
           sed -i 's/access_key = ""/access_key = "${{ secrets.PHP_VERSION_BENCHMARK_AWS_ACCESS_KEY }}"/g' ./php-version-benchmarks/build/infrastructure/config/aws.tfvars