Merge branch 'sycl' into cperkins-win-fix-sycl-unregister-lib

Author: cperkinsintel

.github/workflows/sycl-ur-perf-benchmarking.yml

@@ -28,8 +28,18 @@ on:
           deployment branch will be used.
         required: false
         default: ''
+      save_name:
+        type: string
+        description: |
+          Specify a custom name to use for the benchmark result: If uploading
+          results, this will be the name used to refer results from the current
+          run.
+        required: false
+        default: ''
       upload_results:
         type: string # true/false: workflow_dispatch does not support booleans
+        description: |
+          Upload results to https://intel.github.io/llvm/benchmarks/.
         required: true
       runner:
         type: string
@@ -67,8 +77,14 @@ on:
           Leave both pr_no and commit_hash empty to use latest commit.
         required: false
         default: ''
+      save_name:
+        type: string
+        description: |
+          Name to use for the benchmark result:
+        required: false
+        default: ''
       upload_results:
-        description: 'Save and upload results'
+        description: 'Save and upload results (to https://intel.github.io/llvm/benchmarks)'
         type: choice
         options:
           - false
@@ -90,16 +106,61 @@ on:
 permissions: read-all
 
 jobs:
+  sanitize_inputs:
+    name: Sanitize inputs
+    runs-on: ubuntu-latest
+    env:
+      COMMIT_HASH: ${{ inputs.commit_hash }}
+      PR_NO: ${{ inputs.pr_no }}
+      SAVE_NAME: ${{ inputs.save_name }}
+    outputs:
+      benchmark_save_name: ${{ steps.sanitize.outputs.benchmark_save_name }}
+      build_ref: ${{ steps.sanitize.outputs.build_ref }}
+    steps:
+      - id: sanitize
+        run: |
+          # Validate user inputs:
+          # usage: check_if_nonempty <var> <regex to check var against> <err message>
+          check_nonempty() {
+            [ -z "$1" ] && return
+            if [ -z "$(echo "$1" | grep -P "$2")" ]; then
+              echo "$3"
+              exit 1
+            fi
+          }
+          check_nonempty "$COMMIT_HASH" '^[0-9a-f]{7,}$' "Bad commit hash (or hash short)."
+          check_nonempty "$PR_NO" '^[0-9]+$' "Bad PR number."
+          check_nonempty "$SAVE_NAME" '^[A-Za-z][A-Za-z0-9_-]+$' "Bad save name."
+
+          BENCHMARK_SAVE_NAME=""
+          BUILD_REF="${{ github.ref }}"
+          if [ -n "$SAVE_NAME" ]; then
+            BENCHMARK_SAVE_NAME="$(echo "$SAVE_NAME" | tr -cd 'A-Za-z0-9_-')"
+          fi;
+          if [ -n "$COMMIT_HASH" ]; then
+            echo "Using commit hash $COMMIT_HASH for build..."
+            BUILD_REF="$COMMIT_HASH"
+            shortened_commit="$(echo "$COMMIT_HASH" | cut -c 1-7)"
+            [ -z "$BENCHMARK_SAVE_NAME" ] && BENCHMARK_SAVE_NAME="Commit_${shortened_commit}"
+          elif [ -n "$PR_NO" ]; then
+            echo "Using PR no. $PR_NO for build..."
+            BUILD_REF="refs/pull/$PR_NO/head"
+            [ -z "$BENCHMARK_SAVE_NAME" ] && BENCHMARK_SAVE_NAME="PR_${PR_NO}"
+          fi
+          [ -z "$BENCHMARK_SAVE_NAME" ] && BENCHMARK_SAVE_NAME="Baseline"
+
+          echo "benchmark_save_name=$BENCHMARK_SAVE_NAME" >> $GITHUB_OUTPUT
+          echo "build_ref=$BUILD_REF" >> $GITHUB_OUTPUT
+
+          echo "Final sanitized values:"
+          cat $GITHUB_OUTPUT
+
   build_sycl:
     name: Build SYCL
+    needs: [ sanitize_inputs ]
     uses: ./.github/workflows/sycl-linux-build.yml
     with:
-      build_ref: |
-        ${{
-          inputs.commit_hash != '' && inputs.commit_hash ||
-          inputs.pr_no != '' && format('refs/pull/{0}/head', inputs.pr_no) ||
-          github.ref
-        }}
+      build_ref: ${{ needs.sanitize_inputs.outputs.build_ref }}
       build_cache_root: "/__w/"
       build_cache_suffix: "prod_noassert"
       build_configure_extra_args: "--no-assertions"
@@ -112,14 +173,12 @@ jobs:
 
   run_benchmarks_build:
     name: Run Benchmarks on Build
-    needs: [ build_sycl ]
+    needs: [ build_sycl, sanitize_inputs ]
     strategy:
       matrix:
         include:
-          - ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || inputs.pr_no != '' && format('refs/pull/{0}/head', inputs.pr_no) || github.ref }}
-            save_name: ${{ inputs.commit_hash != '' && format('Commit{0}', inputs.commit_hash) || inputs.pr_no != '' && format('PR{0}', inputs.pr_no) || 'Baseline' }}
-            # Set default values if not specified:
-            runner: ${{ inputs.runner || '["PVC_PERF"]' }}
+          # Set default values if not specified:
+          - runner: ${{ inputs.runner || '["PVC_PERF"]' }}
             backend: ${{ inputs.backend || 'level_zero:gpu' }}
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     secrets: inherit
@@ -131,9 +190,9 @@ jobs:
       target_devices: ${{ matrix.backend }}
       tests_selector: benchmarks
       benchmark_upload_results: ${{ inputs.upload_results }}
-      benchmark_save_name: ${{ matrix.save_name }}
+      benchmark_save_name: ${{ needs.sanitize_inputs.outputs.benchmark_save_name }}
       benchmark_preset: ${{ inputs.preset }}
-      repo_ref: ${{ matrix.ref }}
+      repo_ref: ${{ needs.sanitize_inputs.outputs.build_ref }}
       toolchain_artifact: ${{ needs.build_sycl.outputs.toolchain_artifact }}
       toolchain_artifact_filename: ${{ needs.build_sycl.outputs.toolchain_artifact_filename }}
       toolchain_decompress_command: ${{ needs.build_sycl.outputs.toolchain_decompress_command }}

clang/include/clang/Driver/Options.td

@@ -9265,14 +9265,11 @@ class CLRemainingArgsJoined<string name,
 // (We don't put any of these in cl_compile_Group as the options they alias are
 // already in the right group.)
 
-// INTEL_CUSTOMIZATION
 def _SLASH_Qfp_accuracy_EQ : CLJoined<"Qfp-accuracy=">,
   Alias<ffp_accuracy_EQ>;
 def _SLASH_Qfp_accuracy_COL : CLJoined<"Qfp-accuracy:">,
   Alias<ffp_accuracy_EQ>,HelpText<"Specifies the required accuracy for "
   "floating-point operations and library calls.">;
-// END INTEL_CUSTOMIZATION
-
 def _SLASH_Brepro : CLFlag<"Brepro">,
   HelpText<"Do not write current time into COFF output (breaks link.exe /incremental)">,
   Alias<mno_incremental_linker_compatible>;

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

@@ -213,15 +213,19 @@ runs:
         --compare-file "./llvm-ci-perf-results/results/${SAVE_NAME}_${SAVE_TIMESTAMP}.json" \
         --results-dir "./llvm-ci-perf-results/results/" \
         --regression-filter '^[a-z_]+_sycl ' \
+        --regression-filter-type 'SYCL' \
         --verbose \
+        --produce-github-summary \
         ${{ inputs.dry_run == 'true' && '--dry-run' || '' }} \
 
       echo "-----"
 
-  - name: Cache changes to benchmark folder for archival purposes
+  - name: Cache changes and upload github summary
     if: always()
     shell: bash
     run: | 
+      [ -f "github_summary.md" ] && cat github_summary.md >> $GITHUB_STEP_SUMMARY
+
       cd "./llvm-ci-perf-results"
       git add .
       for diff in $(git diff HEAD --name-only); do

devops/dependencies-igc-dev.json

@@ -1,10 +1,10 @@
 {
   "linux": {
     "igc_dev": {
-      "github_tag": "igc-dev-e9afb18",
-      "version": "e9afb18",
-      "updated_at": "2025-08-14T02:09:16Z",
-      "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/3761059372/zip",
+      "github_tag": "igc-dev-3c9eb3b",
+      "version": "3c9eb3b",
+      "updated_at": "2025-08-16T05:10:12Z",
+      "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/3778774566/zip",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     }
   }

devops/scripts/benchmarks/benches/compute.py

@@ -7,11 +7,13 @@
 import csv
 import io
 import copy
+import math
+from enum import Enum
+
 from utils.utils import run, git_clone, create_build_path
-from .base import Benchmark, Suite
 from utils.result import BenchmarkMetadata, Result
+from .base import Benchmark, Suite
 from options import options
-from enum import Enum
 
 
 class RUNTIMES(Enum):
@@ -402,6 +404,9 @@ def parse_output(self, output):
                 median = float(data_row[2])
                 # compute benchmarks report stddev as %
                 stddev = mean * (float(data_row[3].strip("%")) / 100.0)
+                if not math.isfinite(stddev):
+                    stddev = 0.0  # Default to 0.0 if stddev is invalid
+
                 unit = data_row[7]
                 results.append((label, median, stddev, unit))
             except (ValueError, IndexError) as e:

devops/scripts/benchmarks/compare.py

@@ -340,14 +340,25 @@ def to_hist(
     parser_avg.add_argument(
         "--regression-filter",
         type=str,
-        help="If provided, only regressions matching provided regex will cause exit status 1.",
+        help="If provided, only regressions in tests matching provided regex will cause exit status 1.",
         default=None,
     )
+    parser_avg.add_argument(
+        "--regression-filter-type",
+        type=str,
+        help="Name to use in logging for tests that fall within the filter defined by --regression-filter; i.e. if --regression-filter filters for SYCL benchmarks, --regression-filter-type could be 'SYCL'.",
+        default="filtered",
+    )
     parser_avg.add_argument(
         "--dry-run",
         action="store_true",
         help="Do not return error upon regressions.",
     )
+    parser_avg.add_argument(
+        "--produce-github-summary",
+        action="store_true",
+        help=f"Create a summary file '{options.github_summary_filename}' for Github workflow summaries.",
+    )
 
     args = parser.parse_args()
 
@@ -365,6 +376,14 @@ def to_hist(
             args.avg_type, args.name, args.compare_file, args.results_dir, args.cutoff
         )
 
+        # Initialize Github summary variables:
+        if args.produce_github_summary:
+            gh_summary = []
+
+            filter_type_capitalized = (
+                args.regression_filter_type[0].upper() + args.regression_filter_type[1:]
+            )
+
         # Not all regressions are of concern: if a filter is provided, filter
         # regressions using filter
         regressions_ignored = []
@@ -378,7 +397,7 @@ def to_hist(
                     regressions_ignored.append(test)
 
         def print_regression(entry: dict, is_warning: bool = False):
-            """Print an entry outputted from Compare.to_hist
+            """Print an entry outputted from Compare.to_hist()
 
             Args:
                 entry (dict): The entry to print
@@ -390,28 +409,80 @@ def print_regression(entry: dict, is_warning: bool = False):
             log_func(f"-- Run result: {entry['value']}")
             log_func(f"-- Delta: {entry['delta']}")
             log_func("")
+            if args.produce_github_summary:
+                gh_summary.append(f"#### {entry['name']}:")
+                gh_summary.append(
+                    f"- Historic {entry['avg_type']}: {entry['hist_avg']}"
+                )
+                gh_summary.append(f"- Run result: {entry['value']}")
+                gh_summary.append(
+                    # Since we are dealing with floats, our deltas have a lot
+                    # of decimal places. For easier readability, we round our
+                    # deltas and format our Github summary output as:
+                    #
+                    # Delta: <rounded number>% (<full number>)
+                    #
+                    f"- Delta: {round(entry['delta']*100, 2)}% ({entry['delta']})"
+                )
+                gh_summary.append("")
 
         if improvements:
             log.info("#")
             log.info("# Improvements:")
             log.info("#")
+            if args.produce_github_summary:
+                gh_summary.append(f"### Improvements")
+                gh_summary.append(
+                    f"<details><summary>{len(improvements)} improved tests:</summary>"
+                )
+                gh_summary.append("")
             for test in improvements:
                 print_regression(test)
+            if args.produce_github_summary:
+                gh_summary.append("</details>")
+                gh_summary.append("")
         if regressions_ignored:
             log.info("#")
-            log.info("# Regressions (filtered out by regression-filter):")
+            log.info("# Regressions (filtered out by --regression-filter):")
             log.info("#")
+            if args.produce_github_summary:
+                gh_summary.append(f"### Non-{filter_type_capitalized} Regressions")
+                gh_summary.append(
+                    f"<details><summary>{len(regressions_ignored)} non-{args.regression_filter_type} regressions:</summary>"
+                )
+                gh_summary.append("")
             for test in regressions_ignored:
                 print_regression(test)
+            if args.produce_github_summary:
+                gh_summary.append("</details>")
+                gh_summary.append("")
         if regressions_of_concern:
             log.warning("#")
             log.warning("# Regressions:")
             log.warning("#")
+            if args.produce_github_summary:
+                gh_summary.append(f"### {filter_type_capitalized} Regressions")
+                gh_summary.append(
+                    f"{len(regressions_of_concern)} {args.regression_filter_type} regressions. These regressions warrant a CI failure:"
+                )
+                gh_summary.append("")
             for test in regressions_of_concern:
                 print_regression(test, is_warning=True)
+            if args.produce_github_summary:
+                gh_summary.append("")
+
             if not args.dry_run:
-                exit(1)  # Exit 1 to trigger github test failure
+                if args.produce_github_summary:
+                    with open(options.github_summary_filename, "w") as f:
+                        f.write("\n".join(gh_summary))
+                exit(1)  # Exit 1 to trigger Github test failure
+
         log.info("No unexpected regressions found!")
+        if args.produce_github_summary:
+            gh_summary.append("No unexpected regressions found!")
+            with open(options.github_summary_filename, "w") as f:
+                f.write("\n".join(gh_summary))
+
     else:
         log.error("Unsupported operation: exiting.")
         exit(1)

devops/scripts/benchmarks/options.py

@@ -92,6 +92,8 @@ class Options:
     # CI scripts vs SYCl build source.
     github_repo_override: str = None
     git_commit_override: str = None
+    # Filename used to store Github summary files:
+    github_summary_filename: str = "github_summary.md"
     # Archiving settings
     # Archived runs are stored separately from the main dataset but are still accessible
     # via the HTML UI when "Include archived runs" is enabled.