Remove cutoff timestamp behavior for aggregate

Author: ianayl

.github/workflows/sycl-benchmark-aggregate.yml

@@ -9,17 +9,18 @@ name: Aggregate compute-benchmark averages from historical data
 on:
   workflow_dispatch:
     inputs:
-      cutoff_timestamp:
+      lookback_days:
         description: |
-          Timestamp (YYYYMMDD_HHMMSS) indicating the age limit of data used in
-          average calculation: Any benchmark results created before this 
-          timestamp is excluded from being aggregated. 
-        type: string
+          Number of days from today to look back in historical results for:
+          This sets the age limit of data used in average calculation: Any
+          benchmark results created before `lookback_days` from today is
+          excluded from being aggregated in the historical average. 
+        type: number
         required: true
   workflow_call:
     inputs:
-      cutoff_timestamp:
-        type: string
+      lookback_days:
+        type: number
         required: true
 
 permissions:
@@ -38,6 +39,6 @@ jobs:
     - name: Aggregate benchmark results and produce historical average
       uses: ./devops/actions/benchmarking/aggregate
       with:
-        cutoff_timestamp: ${{ inputs.cutoff_timestamp }}
+        lookback_days: ${{ inputs.lookback_days }}
       env:
-        GITHUB_TOKEN: ${{ secrets.LLVM_SYCL_BENCHMARK_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.LLVM_SYCL_BENCHMARK_TOKEN }}

.github/workflows/sycl-nightly.yml

@@ -242,6 +242,8 @@ jobs:
     if: always() && !cancelled()
     name: Aggregate benchmark results and produce historical averages
     uses: ./.github/workflows/sycl-benchmark-aggregate.yml
+    with:
+      lookback_days: 7
 
   run-sycl-benchmarks:
     needs: [ubuntu2204_build, aggregate_benchmark_results]

devops/actions/benchmarking/aggregate/action.yml

@@ -15,37 +15,23 @@ name: 'Aggregate compute-benchmark results and produce historical averages'
 #
 
 inputs:
-  cutoff_timestamp:
-    type: string
+  lookback_days:
+    type: number
     required: true
 
 runs:
   using: "composite"
   steps:
-  - name: Sanitize provided timestamp
+  - name: Obtain oldest timestamp allowed for data in aggregation
     shell: bash
     run: |
-      # Sanitize the cutoff timestamp provided
-      #
-      # This timestamp controls which historical results are used to compute
-      # measures of central tendency: Any files timestamped *before* this time
-      # will be *excluded* from the central tendency calculation.
-
-      # Regex greps YYYYMMDD_HHMMSS
-      TIMESTAMP_RE='^[0-9]{4}(0[1-9]|1[0-2])([0-2][0-9]|3[01])_([01][0-9]|2[0-3])([0-5][0-9])([0-5][0-9])$'
-
-      # Note:
-      # - variables from input context should be surrounded with '' to prevent
-      #   remote code execution
-      # - `-o` needs to be kept in the grep command; `-o` is exact match only,
-      #   incase user somehow manages to inject extra text, `-o` should take
-      #   care of it.
-      # - DO NOT use input.cutoff_timestamp directly, only use SANITIZED_TIMESTAMP
-      SANITIZED_TIMESTAMP="$(echo '${{ inputs.cutoff_timestamp }}' | grep -oE "$TIMESTAMP_RE")"
+      # DO NOT use inputs.lookback_days directly, only use SANITIZED_TIMESTAMP.
+      SANITIZED_LOOKBACK_DAYS ="$(echo '${{ inputs.lookback_days }}' | grep -o "^[0-9]$")"
       if [ -z "$SANITIZED_TIMESTAMP" ]; then
-        echo "Please ensure input in input.cutoff_timestamp is exactly YYYYMMDD_HHMMSS."
-        exit 1  # Terminate workflow
+        echo "Please ensure inputs.lookback_days is a number.
+        exit 1
       fi
+      SANITIZED_TIMESTAMP="$(date -d "$SANITIZED_LOOKBACK_DAYS days ago" +%Y%m%d_%H%M%S)"
       echo "SANITIZED_TIMESTAMP=$SANITIZED_TIMESTAMP" >> $GITHUB_ENV
   - name: Load benchmarking configuration
     shell: bash

devops/actions/run-tests/benchmark/action.yml

@@ -54,6 +54,8 @@ runs:
       git add .
       git commit -m "[GHA] Upload compute-benchmarks results from https://github.com/intel/llvm/actions/runs/${{ github.run_id }}"
       git push "https://[email protected]/$SANITIZED_PERF_RES_GIT_REPO.git" "$SANITIZED_PERF_RES_GIT_BRANCH"
+  - shell: bash
+    run: echo \n\#\n\# Artifact link for benchmark results here\n\#\n
   - name: Archive compute-benchmark results
     if: always()
     uses: actions/upload-artifact@v4
@@ -64,6 +66,6 @@ runs:
     if: always()
     uses: ./devops/actions/benchmarking/aggregate
     with:
-      cutoff_timestamp: 20240101_000000
+      lookback_days: 7
     env:
       GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}

devops/scripts/benchmarking/benchmark.sh

@@ -85,7 +85,7 @@ check_regression() {
 #
 # Usage: cache <relative path of output csv>
 cache() {
-    mkdir -p ./artifact/passing_tests/ ./artifact/failed_tests
+    mkdir -p "$(dirname ./artifact/passing_tests/$1)" "$(dirname ./artifact/failed_tests/$1)"
     cp "./artifact/failed_tests/$1" "./artifact/passing_tests/$1"
     mv "./artifact/failed_tests/$1" "./llvm-ci-perf-results/$1"
 }
@@ -112,7 +112,7 @@ process_benchmarks() {
         echo "Setting tests to run via cli is not currently supported."
         exit 1
     else
-        rm ./artifact/benchmarks_errored.log ./artifact/benchmarks_failed.log
+        rm ./artifact/benchmarks_errored.log ./artifact/benchmarks_failed.log 2> /dev/null
         mkdir -p ./artifact
         # Loop through each line of enabled_tests.conf, but ignore lines in the
         # test config starting with #'s: