Merge branch 'oneapi-src:master' into new_ecc_test_default_ecc_values

Author: kalyanalle

.github/docker/windows.Dockerfile

@@ -58,36 +58,36 @@ cd ../.. && `
 rm -rf zlib-1.3.1"
 
 RUN "`
-curl -OSL --ssl-no-revoke https://download.sourceforge.net/libpng/lpng1639.zip && `
-7z.exe x lpng1639.zip && `
-rm lpng1639.zip && `
-mkdir -p lpng1639/build && `
-cd lpng1639/build && `
+curl -OSL --ssl-no-revoke https://download.sourceforge.net/libpng/lpng1647.zip && `
+7z.exe x lpng1647.zip && `
+rm lpng1647.zip && `
+mkdir -p lpng1647/build && `
+cd lpng1647/build && `
 cmake .. -T host=x64 -A x64 && `
 cmake --build . --target INSTALL --config Release && `
 cd ../.. && `
-rm -rf lpng1639"
+rm -rf lpng1647"
 
 RUN "`
-curl -SL --ssl-no-revoke https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v2022.09.30.zip -o OpenCL-Headers.zip && `
+curl -SL --ssl-no-revoke https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v2024.10.24.zip -o OpenCL-Headers.zip && `
 7z.exe x OpenCL-Headers.zip && `
 rm OpenCL-Headers.zip && `
-mkdir OpenCL-Headers-2022.09.30/build && `
-cd OpenCL-Headers-2022.09.30/build && `
+mkdir OpenCL-Headers-2024.10.24/build && `
+cd OpenCL-Headers-2024.10.24/build && `
 cmake .. && `
 cmake --build . --target install && `
 cd ../.. && `
-rm -rf OpenCL-Headers-2022.09.30"
+rm -rf OpenCL-Headers-2024.10.24"
 RUN "`
-curl -SL --ssl-no-revoke https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v2022.09.30.zip -o OpenCL-ICD-Loader.zip && `
+curl -SL --ssl-no-revoke https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v2024.10.24.zip -o OpenCL-ICD-Loader.zip && `
 7z.exe x OpenCL-ICD-Loader.zip && `
 rm OpenCL-ICD-Loader.zip && `
-mkdir OpenCL-ICD-Loader-2022.09.30/build && `
-cd OpenCL-ICD-Loader-2022.09.30/build && `
+mkdir OpenCL-ICD-Loader-2024.10.24/build && `
+cd OpenCL-ICD-Loader-2024.10.24/build && `
 cmake .. -T host=x64 -A x64 && `
 cmake --build . --target install && `
 cd ../.. && `
-rm -rf OpenCL-ICD-Loader-2022.09.30"
+rm -rf OpenCL-ICD-Loader-2024.10.24"
 
 RUN "`
 curl -OSL --ssl-no-revoke https://archives.boost.io/release/1.73.0/source/boost_1_73_0.7z && `

.github/workflows/build-quick.yml

@@ -23,7 +23,9 @@ jobs:
           libboost-all-dev \
           libpapi-dev \
           libpng-dev \
-          libva-dev
+          libva-dev \
+          clang \
+          clang-format-14
     - uses: hendrikmuhs/ccache-action@v1
     - name: Build Loader
       working-directory: level-zero
@@ -46,6 +48,18 @@ jobs:
           -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -D CMAKE_BUILD_TYPE=Release \
           ..
+        ../clang-format-patch.sh .. > clang_format_results.txt
+        if [[ -s ./clang_format_results.txt ]]; then
+            echo "Clang Format Check failed"
+            cat ./clang_format_results.txt
+            echo "<h3>clang-format</h3>" >> ${GITHUB_STEP_SUMMARY}
+            echo \`\`\` >> ${GITHUB_STEP_SUMMARY}
+            cat ./clang_format_results.txt >> ${GITHUB_STEP_SUMMARY}
+            echo \`\`\` >> ${GITHUB_STEP_SUMMARY}
+            exit 1
+        else
+            echo "::notice::clang-format check succeeded"
+        fi
         make -j$(nproc) install
     - name: Check ./scripts/level_zero_report_utils.py
       env:

clang-format-patch.sh

@@ -16,9 +16,10 @@ FILES=$( \
     $TMP_SRC/negative_tests \
     $TMP_SRC/perf_tests \
     $TMP_SRC/utils \
-    -name '*.cpp' -or -name '*.hpp' \
+    $TMP_SRC/layer_tests \
+    -name '*.cpp' -or -name '*.hpp' -or -name '*.h'
 )
-clang-format-7 -style=file -i $FILES >/dev/null
+clang-format-14 -style=file -i $FILES >/dev/null
 
 git -C $TMP_SRC diff
 

cmake/clang_tools.cmake

@@ -1,8 +1,8 @@
-# Copyright (C) 2019 Intel Corporation
+# Copyright (C) 2019-2025 Intel Corporation
 # SPDX-License-Identifier: MIT
-find_program(CLANG_FORMAT NAMES clang-format-7)
+find_program(CLANG_FORMAT NAMES clang-format-14)
 if(CLANG_FORMAT)
-    message(STATUS "Found clang-format-7: ${CLANG_FORMAT}")
+    message(STATUS "Found clang-format: ${CLANG_FORMAT}")
     add_custom_target(clang-format
       COMMENT "Checking code formatting and fixing issues"
       COMMAND
@@ -17,5 +17,5 @@ if(CLANG_FORMAT)
       COMMAND ! [ -s ${CMAKE_BINARY_DIR}/clang_format_results.patch ]
     )
 else()
-    message(WARNING "clang-format-7 not found. clang-format and clang-format-check targets will be disabled.")
+    message(WARNING "clang-format not found. clang-format and clang-format-check targets will be disabled.")
 endif()

conformance_tests/core/test_cmdlist/src/test_cmdlist.cpp

@@ -802,68 +802,69 @@ TEST(
   lzt::free_memory(expectedMemory);
 }
 
-class zeCommandListEventCounterTests
-    : public lzt::zeEventPoolTests {
+class zeCommandListEventCounterTests : public lzt::zeEventPoolTests {
 protected:
   void SetUp() override {
     ze_event_pool_desc_t eventPoolDesc = {};
     eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_HOST_VISIBLE;
     eventPoolDesc.count = 10;
 
-    ze_event_pool_counter_based_exp_desc_t counterBasedExtension = {ZE_STRUCTURE_TYPE_COUNTER_BASED_EVENT_POOL_EXP_DESC};
-    counterBasedExtension.flags = ZE_EVENT_POOL_COUNTER_BASED_EXP_FLAG_NON_IMMEDIATE;
+    ze_event_pool_counter_based_exp_desc_t counterBasedExtension = {
+        ZE_STRUCTURE_TYPE_COUNTER_BASED_EVENT_POOL_EXP_DESC};
+    counterBasedExtension.flags =
+        ZE_EVENT_POOL_COUNTER_BASED_EXP_FLAG_NON_IMMEDIATE;
     eventPoolDesc.pNext = &counterBasedExtension;
     ep.InitEventPool(eventPoolDesc);
     ep.create_event(event0, ZE_EVENT_SCOPE_FLAG_HOST, 0);
 
-
-    cmdlist.push_back(lzt::create_command_list(
-      lzt::zeDevice::get_instance()->get_device(),
-      ZE_COMMAND_LIST_FLAG_IN_ORDER));
+    cmdlist.push_back(
+        lzt::create_command_list(lzt::zeDevice::get_instance()->get_device(),
+                                 ZE_COMMAND_LIST_FLAG_IN_ORDER));
     cmdqueue.push_back(lzt::create_command_queue(
-      lzt::zeDevice::get_instance()->get_device(),
-      ZE_COMMAND_QUEUE_FLAG_IN_ORDER, ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS,
-      ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0));
-    cmdlist.push_back(lzt::create_command_list(
-      lzt::zeDevice::get_instance()->get_device(),
-    ZE_COMMAND_LIST_FLAG_IN_ORDER));
+        lzt::zeDevice::get_instance()->get_device(),
+        ZE_COMMAND_QUEUE_FLAG_IN_ORDER, ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS,
+        ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0));
+    cmdlist.push_back(
+        lzt::create_command_list(lzt::zeDevice::get_instance()->get_device(),
+                                 ZE_COMMAND_LIST_FLAG_IN_ORDER));
     cmdqueue.push_back(lzt::create_command_queue(
-      lzt::zeDevice::get_instance()->get_device(),
-      ZE_COMMAND_QUEUE_FLAG_IN_ORDER, ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS,
-      ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0));
-    cmdlist.push_back(lzt::create_command_list(
-      lzt::zeDevice::get_instance()->get_device(),
-      ZE_COMMAND_LIST_FLAG_IN_ORDER));
+        lzt::zeDevice::get_instance()->get_device(),
+        ZE_COMMAND_QUEUE_FLAG_IN_ORDER, ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS,
+        ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0));
+    cmdlist.push_back(
+        lzt::create_command_list(lzt::zeDevice::get_instance()->get_device(),
+                                 ZE_COMMAND_LIST_FLAG_IN_ORDER));
     cmdqueue.push_back(lzt::create_command_queue(
-      lzt::zeDevice::get_instance()->get_device(),
-      ZE_COMMAND_QUEUE_FLAG_IN_ORDER, ZE_COMMAND_QUEUE_MODE_DEFAULT,
-      ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0));
-    cmdlist.push_back(lzt::create_command_list(
-      lzt::zeDevice::get_instance()->get_device(),
-      ZE_COMMAND_LIST_FLAG_IN_ORDER));
+        lzt::zeDevice::get_instance()->get_device(),
+        ZE_COMMAND_QUEUE_FLAG_IN_ORDER, ZE_COMMAND_QUEUE_MODE_DEFAULT,
+        ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0));
+    cmdlist.push_back(
+        lzt::create_command_list(lzt::zeDevice::get_instance()->get_device(),
+                                 ZE_COMMAND_LIST_FLAG_IN_ORDER));
     cmdqueue.push_back(lzt::create_command_queue(
-      lzt::zeDevice::get_instance()->get_device(),
-      ZE_COMMAND_QUEUE_FLAG_IN_ORDER, ZE_COMMAND_QUEUE_MODE_DEFAULT,
-      ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0));
+        lzt::zeDevice::get_instance()->get_device(),
+        ZE_COMMAND_QUEUE_FLAG_IN_ORDER, ZE_COMMAND_QUEUE_MODE_DEFAULT,
+        ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0));
   }
 
   void TearDown() override {
     ep.destroy_event(event0);
     for (auto cl : cmdlist) {
-        lzt::destroy_command_list(cl);
+      lzt::destroy_command_list(cl);
     }
     for (auto cq : cmdqueue) {
-        lzt::destroy_command_queue(cq);
+      lzt::destroy_command_queue(cq);
     }
   }
-  std::vector<ze_command_list_handle_t>cmdlist;
-  std::vector<ze_command_queue_handle_t>cmdqueue;
+  std::vector<ze_command_list_handle_t> cmdlist;
+  std::vector<ze_command_queue_handle_t> cmdqueue;
   ze_event_handle_t event0 = nullptr;
 };
 
-static void RunAppendLaunchKernelEvent(std::vector<ze_command_list_handle_t> cmdlist,
-                                  std::vector<ze_command_queue_handle_t> cmdqueue,
-                                  ze_event_handle_t event, int num_cmdlist) {
+static void
+RunAppendLaunchKernelEvent(std::vector<ze_command_list_handle_t> cmdlist,
+                           std::vector<ze_command_queue_handle_t> cmdqueue,
+                           ze_event_handle_t event, int num_cmdlist) {
   const size_t size = 16;
   const int addval = 10;
   const int num_iterations = 100;
@@ -880,40 +881,37 @@ static void RunAppendLaunchKernelEvent(std::vector<ze_command_list_handle_t> cmd
   lzt::set_group_size(kernel, 1, 1, 1);
 
   int totalVal[10];
-  
+
   memset(buffer, 0x0, num_cmdlist * size * sizeof(int));
 
   for (int n = 0; n < num_cmdlist; n++) {
     int *p_dev = static_cast<int *>(buffer);
-    p_dev+=(n * size);
+    p_dev += (n * size);
     lzt::set_argument_value(kernel, 0, sizeof(p_dev), &p_dev);
     lzt::set_argument_value(kernel, 1, sizeof(addval), &addval);
     ze_group_count_t tg;
     tg.groupCountX = static_cast<uint32_t>(size);
     tg.groupCountY = 1;
     tg.groupCountZ = 1;
 
-    lzt::append_launch_function(cmdlist[n], kernel, &tg, nullptr, 0,
-                              nullptr);
+    lzt::append_launch_function(cmdlist[n], kernel, &tg, nullptr, 0, nullptr);
 
     totalVal[n] = 0;
     for (int i = 0; i < (num_iterations - 1); i++) {
       addval2 = rand() & 0xFFFF;
       totalVal[n] += addval2;
       lzt::set_argument_value(kernel, 1, sizeof(addval2), &addval2);
 
-      lzt::append_launch_function(cmdlist[n], kernel, &tg, nullptr, 0,
-                                nullptr);
+      lzt::append_launch_function(cmdlist[n], kernel, &tg, nullptr, 0, nullptr);
     }
-    addval2 = rand() & 0xFFFF;;
+    addval2 = rand() & 0xFFFF;
+    ;
     totalVal[n] += addval2;
     lzt::set_argument_value(kernel, 1, sizeof(addval2), &addval2);
     if (n == 0) {
-        lzt::append_launch_function(cmdlist[n], kernel, &tg, event, 0,
-                                nullptr);
+      lzt::append_launch_function(cmdlist[n], kernel, &tg, event, 0, nullptr);
     } else {
-        lzt::append_launch_function(cmdlist[n], kernel, &tg, event, 0,
-                                &event);
+      lzt::append_launch_function(cmdlist[n], kernel, &tg, event, 0, &event);
     }
     lzt::close_command_list(cmdlist[n]);
     lzt::execute_command_lists(cmdqueue[n], 1, &cmdlist[n], nullptr);
@@ -924,7 +922,8 @@ static void RunAppendLaunchKernelEvent(std::vector<ze_command_list_handle_t> cmd
 
   for (int n = 0; n < num_cmdlist; n++) {
     for (size_t i = 0; i < size; i++) {
-      EXPECT_EQ(static_cast<int *>(buffer)[(n * size) + i], (addval + totalVal[n]));
+      EXPECT_EQ(static_cast<int *>(buffer)[(n * size) + i],
+                (addval + totalVal[n]));
     }
     lzt::reset_command_list(cmdlist[n]);
   }
@@ -937,15 +936,14 @@ TEST_F(
     zeCommandListEventCounterTests,
     GivenInOrderCommandListWhenAppendLaunchKernelInstructionCounterEventThenVerifyImmediateExecution) {
 
-     bool event_pool_ext_found = lzt:: check_if_extension_supported(lzt::get_default_driver(),
-                                  "ZE_experimental_event_pool_counter_based");
-     EXPECT_TRUE(event_pool_ext_found);
-  
-    for (int i = 1; i <= cmdlist.size(); i++) {
-      LOG_INFO << "Testing " << i << " command list(s)"; 
-      RunAppendLaunchKernelEvent(cmdlist, cmdqueue, event0, i);
-    }
-}
+  bool event_pool_ext_found = lzt::check_if_extension_supported(
+      lzt::get_default_driver(), "ZE_experimental_event_pool_counter_based");
+  EXPECT_TRUE(event_pool_ext_found);
 
+  for (int i = 1; i <= cmdlist.size(); i++) {
+    LOG_INFO << "Testing " << i << " command list(s)";
+    RunAppendLaunchKernelEvent(cmdlist, cmdqueue, event0, i);
+  }
+}
 
 } // namespace