Merge branch 'sycl' into sean/async-alloc-maxSize-ifdef

Author: Seanst98

.github/workflows/sycl-windows-run-tests.yml

@@ -149,14 +149,22 @@ jobs:
         cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="level_zero:gpu" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\\github\\level-zero_win-sdk\\lib" -DLEVEL_ZERO_INCLUDE="D:\\github\\level-zero_win-sdk\\include" -DLLVM_LIT="..\\llvm\\llvm\\utils\\lit\\lit.py"
     - name: Run End-to-End tests
       if: inputs.tests_selector == 'e2e'
-      shell: bash
+      shell: bash {0}
       run: |
         # Run E2E tests.
         if [[ ${{inputs.compiler}} == 'icx' ]]; then
            export LIT_FILTER_OUT="compile_on_win_with_mdd"
         fi
         export LIT_OPTS="-v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests ${{ inputs.extra_lit_opts }}"
-        cmake --build build-e2e --target check-sycl-e2e
+        cmake --build build-e2e --target check-sycl-e2e > e2e.log 2>&1
+
+        exit_code=$?
+        cat e2e.log
+        if [ $exit_code -ne 0 ]; then
+          # This is duplicated between lin/win, updates must change both.
+          awk '/^Failed Tests|Unexpectedly Passed Tests|Unresolved tests|Timed Out Tests|Testing Time/{flag=1}/FAILED: CMakeFiles/{flag=0}flag' e2e.log >> $GITHUB_STEP_SUMMARY
+        fi
+        exit $exit_code
 
     - name: Run SYCL CTS Tests
       if: inputs.tests_selector == 'cts'

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

@@ -67,7 +67,7 @@ runs:
         # SYCL_CTS_EXCLUDE_TEST_CATEGORIES - Optional file specifying a list
         # of test categories to be excluded from the build.
         echo "::group::Excluded test categories"
-        cat $cts_exclude_filter
+        [ -f "$cts_exclude_filter" ] && cat "$cts_exclude_filter"
         echo "::endgroup::"
       fi
 
@@ -134,11 +134,13 @@ runs:
         cts_exclude_filter=$PWD/sycl/cts_exclude_filter/L0_GPU
       fi
 
-      while IFS= read -r line; do
-        if [[ $line != \#* ]]; then
-          rm "./build-cts/bin/test_$line"
-        fi
-      done < "$cts_exclude_filter"
+      if [ -f "$cts_exclude_filter" ]; then
+        while IFS= read -r line; do
+          if [[ $line != \#* ]]; then
+            rm "./build-cts/bin/test_$line"
+          fi
+        done < "$cts_exclude_filter"
+      fi
 
   - name: Run SYCL CTS tests
     # Proceed with execution even if the previous two steps did not succeed.

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

@@ -65,6 +65,7 @@ runs:
       exit_code=$?
       cat e2e.log
       if [ $exit_code -ne 0 ]; then
+        # This is duplicated between lin/win, updates must change both.
         awk '/^Failed Tests|Unexpectedly Passed Tests|Unresolved tests|Timed Out Tests|Testing Time/{flag=1}/FAILED: CMakeFiles/{flag=0}flag' e2e.log >> $GITHUB_STEP_SUMMARY
       fi
       exit $exit_code

devops/actions/run-tests/windows/cts/action.yml

@@ -67,7 +67,7 @@ runs:
         # SYCL_CTS_EXCLUDE_TEST_CATEGORIES - Optional file specifying a list
         # of test categories to be excluded from the build.
         echo "::group::Excluded test categories"
-        cat $cts_exclude_filter
+        [ -f "$cts_exclude_filter" ] && cat "$cts_exclude_filter"
         echo "::endgroup::"
       fi
 
@@ -136,11 +136,13 @@ runs:
         cts_exclude_filter=$PWD/sycl/cts_exclude_filter/L0_GPU
       fi
 
-      while IFS= read -r line; do
-        if [[ $line != \#* ]]; then
-          rm "./build-cts/bin/test_$line"
-        fi
-      done < "$cts_exclude_filter"
+      if [ -f "$cts_exclude_filter" ]; then
+        while IFS= read -r line; do
+          if [[ $line != \#* ]]; then
+            rm "./build-cts/bin/test_$line"
+          fi
+        done < "$cts_exclude_filter"
+      fi
 
   - name: Run SYCL CTS tests
     # Proceed with execution even if the previous two steps did not succeed.

unified-runtime/source/adapters/cuda/device.cpp

@@ -1089,8 +1089,13 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
     return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
   case UR_DEVICE_INFO_CURRENT_CLOCK_THROTTLE_REASONS: {
     unsigned long long ClocksEventReasons;
+#if (CUDA_VERSION >= 12060)
     UR_CHECK_ERROR(nvmlDeviceGetCurrentClocksEventReasons(hDevice->getNVML(),
                                                           &ClocksEventReasons));
+#else
+    UR_CHECK_ERROR(nvmlDeviceGetCurrentClocksThrottleReasons(
+        hDevice->getNVML(), &ClocksEventReasons));
+#endif
     ur_device_throttle_reasons_flags_t ThrottleReasons = 0;
     constexpr unsigned long long NVMLThrottleFlags[] = {
         nvmlClocksThrottleReasonSwPowerCap,

unified-runtime/source/loader/layers/sanitizer/msan/msan_report.cpp

@@ -36,7 +36,7 @@ void ReportUsesUninitializedValue(const MsanErrorReport &Report,
         (void *)Report.Origin);
   } else {
     getContext()->logger.always(
-        "====WARNING: DeviceSanitizer: use-of-uninitialized-value)");
+        "====WARNING: DeviceSanitizer: use-of-uninitialized-value");
   }
 
   getContext()->logger.always(