Merge branch 'main' into add-command-buffer-support

.clang-format

@@ -1,7 +1,4 @@
 ---
 Language:      Cpp
 BasedOnStyle:  LLVM
-IndentWidth:   4
-InsertBraces: true
-ReflowComments: false
 ...

.editorconfig

@@ -1,6 +1,15 @@
 [*]
 indent_style = space
+indent_size = 2
+
+[*.py]
 indent_size = 4
 
-[.github/workflows/*.yml]
-indent_size = 2
+[scripts/core/*]
+indent_size = 4
+
+[CMakeLists.txt]
+indent_size = 4
+
+[*.cmake]
+indent_size = 4

.github/workflows/benchmarks-reusable.yml

@@ -34,6 +34,10 @@ on:
         required: false
         type: boolean
         default: false
+      compute_runtime_commit:
+        required: false
+        type: string
+        default: ''
 
 permissions:
   contents: read
@@ -200,6 +204,7 @@ jobs:
         --ur ${{ github.workspace }}/ur_install
         --umf ${{ github.workspace }}/umf_build
         --adapter ${{ matrix.adapter.str_name }}
+        --compute-runtime ${{ inputs.compute_runtime_commit }}
         ${{ inputs.upload_report && '--output-html' || '' }}
         ${{ inputs.bench_script_params }}
 

.github/workflows/benchmarks.yml

@@ -43,6 +43,11 @@ on:
         type: string
         required: false
         default: ''
+      compute_runtime_commit:
+        description: 'Compute Runtime commit'
+        type: string
+        required: false
+        default: ''
       upload_report:
         description: 'Upload HTML report'
         type: boolean
@@ -65,4 +70,5 @@ jobs:
       sycl_config_params: ${{ inputs.sycl_config_params }}
       sycl_repo: ${{ inputs.sycl_repo }}
       sycl_commit: ${{ inputs.sycl_commit }}
+      compute_runtime_commit: ${{ inputs.compute_runtime_commit }}
       upload_report: ${{ inputs.upload_report }}

.github/workflows/build-hw-reusable.yml

@@ -112,7 +112,7 @@ jobs:
 
     - name: Test adapter specific
       working-directory: ${{github.workspace}}/build
-      run: ctest -C ${{matrix.build_type}} --output-on-failure -L "adapter-specific" --timeout 180
+      run: ctest -C ${{matrix.build_type}} --output-on-failure -L "adapter-specific" -E "memcheck" --timeout 180
       # Don't run adapter specific tests when building multiple adapters
       if: ${{ matrix.adapter.other_name == '' }}
 

CMakeLists.txt

@@ -236,13 +236,13 @@ endif()
 
 # Check if clang-format (in correct version) is available for Cpp code formatting.
 if(UR_FORMAT_CPP_STYLE)
-    find_program(CLANG_FORMAT NAMES clang-format-15 clang-format-15.0 clang-format)
+    find_program(CLANG_FORMAT NAMES clang-format-18 clang-format-18.1 clang-format)
 
     if(CLANG_FORMAT)
         get_program_version_major_minor(${CLANG_FORMAT} CLANG_FORMAT_VERSION)
         message(STATUS "Found clang-format: ${CLANG_FORMAT} (version: ${CLANG_FORMAT_VERSION})")
 
-        set(CLANG_FORMAT_REQUIRED "15.0")
+        set(CLANG_FORMAT_REQUIRED "18.1")
         if(NOT (CLANG_FORMAT_VERSION VERSION_EQUAL CLANG_FORMAT_REQUIRED))
             message(FATAL_ERROR "required clang-format version is ${CLANG_FORMAT_REQUIRED}")
         endif()

REQUIREMENTS.md

@@ -3,9 +3,9 @@
 ## API and Library Requirements
 
 ### API Namespace
-* API’s will clearly define the functionality
-* API’s will use a consistent style within the library
-* APIs’ will not allow namespace collision when multiple libraries are linked in the same user application
+* APIs will clearly define the functionality
+* APIs will use a consistent style within the library
+* APIs will not allow namespace collision when multiple libraries are linked in the same user application
 * API will be consistent across libraries included in the product
 * Will not allow namespace collision when multiple libraries are linked in the same user application
 * Exceptions:

cmake/helpers.cmake

@@ -83,7 +83,7 @@ set(CFI_FLAGS "")
 if (CFI_HAS_CFI_SANITIZE)
     # cfi-icall requires called functions in shared libraries to also be built with cfi-icall, which we can't
     # guarantee. -fsanitize=cfi depends on -flto
-    set(CFI_FLAGS "-flto -fsanitize=cfi -fno-sanitize=cfi-icall -fsanitize-ignorelist=${CMAKE_SOURCE_DIR}/sanitizer-ignorelist.txt")
+    set(CFI_FLAGS "-flto -fsanitize=cfi -fno-sanitize=cfi-icall -fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/sanitizer-ignorelist.txt")
 endif()
 
 function(add_ur_target_compile_options name)