Merge remote-tracking branch 'origin/sycl' into uwe/fasternativecpuenqueue_async_ops_eventswait_onetbb_merge

Author: uwedolinsky

.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 }}

README.md

@@ -79,10 +79,6 @@ for general guidelines around contributing to this project. You can then see
 [ContributeToDPCPP](./sycl/doc/developer/ContributeToDPCPP.md) for DPC++ specific 
 guidelines.
 
-## Late-outline OpenMP\* and OpenMP\* Offload
-
-See [openmp](/openmp) branch.
-
 # License
 
 See [LICENSE](./sycl/LICENSE.TXT) for details.

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -13038,6 +13038,8 @@ def err_free_function_first_occurrence_missing_attr: Error<
   "the first occurrence of SYCL kernel free function should be declared with 'sycl-nd-range-kernel' or 'sycl-single-task-kernel' compile time properties">;
 def err_free_function_class_method : Error<
   "%select{static |}0class method cannot be used to define a SYCL kernel free function kernel">;
+def err_sycl_kernel_virtual_arg : Error<
+  "argument type '%0' virtually inherited from base class `%1` is not supported as a SYCL kernel argument">;
 
 
 // SYCL kernel entry point diagnostics

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>;