Merge pull request oneapi-src#2533 from zma2/2025-update

jimmytwei · web-flow · commit b5630a059d41 · 2024-10-31T16:13:00.000-07:00
Fix 2025.0 build errors and warnings
diff --git a/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/svd/src/svd.hpp b/DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/svd/src/svd.hpp
@@ -162,7 +162,7 @@ double SingularValueDecomposition(
         [=]() [[intel::kernel_args_restrict]] {
           MatrixReadFromDDRTo2PipesByBlocks<
               T, cols, rows, kNumElementsPerDDRBurst, InputMatrixPipe, InputMatrixPipe2>(
-              input_matrix_device, matrix_count, repetitions);
+	      input_matrix_device, matrix_count, repetitions);
         });
   });
 
diff --git a/Publications/GPU-Opt-Guide/OpenMP/22_mkl_dispatch/CMakeLists.txt b/Publications/GPU-Opt-Guide/OpenMP/22_mkl_dispatch/CMakeLists.txt
@@ -1,6 +1,5 @@
 include_directories(common)
 
-add_example_with_mkl(dgemm_target_variant_dispatch_c)
 add_example_with_mkl(dgemm_dispatch_c)
 add_example_with_mkl(dgemm_example_01)
 add_example_with_mkl(dgemm_example_02)
diff --git a/Publications/GPU-Opt-Guide/sub-group/sg-max-size.cpp b/Publications/GPU-Opt-Guide/sub-group/sg-max-size.cpp
@@ -10,7 +10,7 @@
 #include <random>
 #include <vector>
 
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 constexpr int N = 7;
 
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-0.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-0.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
 int main() {
   sycl::queue q{sycl::gpu_selector_v};
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-1.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-1.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
 int main() {
   sycl::queue q{sycl::gpu_selector_v};
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-2.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-2.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
 int main() {
   sycl::queue q{sycl::gpu_selector_v,
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-3.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-3.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
 int main() {
   sycl::queue q{sycl::gpu_selector_v,
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-4.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-4.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
 int main() {
   sycl::queue q{sycl::gpu_selector_v,
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-5.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-5.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
 int main() {
   sycl::queue q{sycl::gpu_selector_v,
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-6.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-6.cpp
@@ -3,20 +3,17 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
-template <typename T>
-auto get_multi_ptr(T *raw_ptr) {
+template <typename T> auto get_multi_ptr(T *raw_ptr) {
   auto multi_ptr =
-    sycl::address_space_cast<
-      sycl::access::address_space::global_space,
-      sycl::access::decorated::yes>(raw_ptr);
+      sycl::address_space_cast<sycl::access::address_space::global_space,
+                               sycl::access::decorated::yes>(raw_ptr);
 
   return multi_ptr;
 }
 
-
 int main() {
   sycl::queue q{sycl::gpu_selector_v,
                 sycl::property::queue::enable_profiling{}};
@@ -30,21 +27,21 @@ int main() {
   memset(data2, 0xFF, sizeof(int) * N);
 
   auto e = q.submit([&](auto &h) {
-    h.parallel_for(
-        sycl::nd_range(sycl::range{N / 16}, sycl::range{32}),
-        [=](sycl::nd_item<1> it) [[intel::reqd_sub_group_size(16)]] {
-          auto sg = it.get_sub_group();
-          sycl::vec<int, 8> x;
-
-          int base = (it.get_group(0) * 32 +
-                      sg.get_group_id()[0] * sg.get_local_range()[0]) *
-                     16;
-
-          x = sg.load<8>(get_multi_ptr(&(data2[base + 0])));
-          sg.store<8>(get_multi_ptr(&(data[base + 0])), x);
-          x = sg.load<8>(get_multi_ptr(&(data2[base + 128])));
-          sg.store<8>(get_multi_ptr(&(data[base + 128])), x);
-        });
+    h.parallel_for(sycl::nd_range(sycl::range{N / 16}, sycl::range{32}),
+                   [=](sycl::nd_item<1> it) [[intel::reqd_sub_group_size(16)]] {
+                     auto sg = it.get_sub_group();
+                     sycl::vec<int, 8> x;
+
+                     int base =
+                         (it.get_group(0) * 32 +
+                          sg.get_group_id()[0] * sg.get_local_range()[0]) *
+                         16;
+
+                     x = sg.load<8>(get_multi_ptr(&(data2[base + 0])));
+                     sg.store<8>(get_multi_ptr(&(data[base + 0])), x);
+                     x = sg.load<8>(get_multi_ptr(&(data2[base + 128])));
+                     sg.store<8>(get_multi_ptr(&(data[base + 128])), x);
+                   });
   });
   // Snippet end
   q.wait();
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-7.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-7.cpp
@@ -3,15 +3,13 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
-template <typename T>
-auto get_multi_ptr(T *raw_ptr) {
+template <typename T> auto get_multi_ptr(T *raw_ptr) {
   auto multi_ptr =
-    sycl::address_space_cast<
-      sycl::access::address_space::global_space,
-      sycl::access::decorated::yes>(raw_ptr);
+      sycl::address_space_cast<sycl::access::address_space::global_space,
+                               sycl::access::decorated::yes>(raw_ptr);
   return multi_ptr;
 }
 
@@ -28,41 +26,40 @@ int main() {
   memset(data2, 0, sizeof(int) * N);
 
   auto e = q.submit([&](auto &h) {
-    h.parallel_for(
-        sycl::nd_range(sycl::range{N / 16}, sycl::range{32}),
-        [=](sycl::nd_item<1> it) [[intel::reqd_sub_group_size(16)]] {
-          auto sg = it.get_sub_group();
-          sycl::vec<int, 4> x;
+    h.parallel_for(sycl::nd_range(sycl::range{N / 16}, sycl::range{32}),
+                   [=](sycl::nd_item<1> it) [[intel::reqd_sub_group_size(16)]] {
+                     auto sg = it.get_sub_group();
+                     sycl::vec<int, 4> x;
 
-          int base = (it.get_group(0) * 32 +
-                      sg.get_group_id()[0] * sg.get_local_range()[0]) *
-                     16;
+                     int base =
+                         (it.get_group(0) * 32 +
+                          sg.get_group_id()[0] * sg.get_local_range()[0]) *
+                         16;
 
-	  auto load_ptr0 = get_multi_ptr(&(data2[base + 0*64]));
-          x = sg.load<4>(load_ptr0);
+                     auto load_ptr0 = get_multi_ptr(&(data2[base + 0 * 64]));
+                     x = sg.load<4>(load_ptr0);
 
-	  auto store_ptr0 = get_multi_ptr(&(data[base + 0*64]));
-          sg.store<4>(store_ptr0, x);
+                     auto store_ptr0 = get_multi_ptr(&(data[base + 0 * 64]));
+                     sg.store<4>(store_ptr0, x);
 
-	  auto load_ptr1 = get_multi_ptr(&(data2[base + 1*64]));
-          x = sg.load<4>(load_ptr1);
+                     auto load_ptr1 = get_multi_ptr(&(data2[base + 1 * 64]));
+                     x = sg.load<4>(load_ptr1);
 
-	  auto store_ptr1 = get_multi_ptr(&(data[base + 1*64]));
-          sg.store<4>(store_ptr1, x);
+                     auto store_ptr1 = get_multi_ptr(&(data[base + 1 * 64]));
+                     sg.store<4>(store_ptr1, x);
 
-	  auto load_ptr2 = get_multi_ptr(&(data2[base + 2*64]));
-          x = sg.load<4>(load_ptr2);
+                     auto load_ptr2 = get_multi_ptr(&(data2[base + 2 * 64]));
+                     x = sg.load<4>(load_ptr2);
 
-	  auto store_ptr2 = get_multi_ptr(&(data[base + 2*64]));
-          sg.store<4>(store_ptr2, x);
+                     auto store_ptr2 = get_multi_ptr(&(data[base + 2 * 64]));
+                     sg.store<4>(store_ptr2, x);
 
-	  auto load_ptr3 = get_multi_ptr(&(data2[base + 3*64]));
-          x = sg.load<4>(load_ptr3);
+                     auto load_ptr3 = get_multi_ptr(&(data2[base + 3 * 64]));
+                     x = sg.load<4>(load_ptr3);
 
-	  auto store_ptr3 = get_multi_ptr(&(data[base + 3*64]));
-          sg.store<4>(store_ptr3, x);
-
-        });
+                     auto store_ptr3 = get_multi_ptr(&(data[base + 3 * 64]));
+                     sg.store<4>(store_ptr3, x);
+                   });
   });
   // Snippet end
   q.wait();
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-8.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-8.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
 int main() {
   sycl::queue q{sycl::gpu_selector_v,
diff --git a/Publications/GPU-Opt-Guide/sub-group/sub-group-sizes.cpp b/Publications/GPU-Opt-Guide/sub-group/sub-group-sizes.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <iostream>
+#include <sycl/sycl.hpp>
 
 int main(void) {
   sycl::queue q{sycl::gpu_selector_v};
diff --git a/Publications/GPU-Opt-Guide/sub-group/transpose.cpp b/Publications/GPU-Opt-Guide/sub-group/transpose.cpp
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <vector>
 
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 constexpr size_t N = 16;
 typedef unsigned int uint;
@@ -59,7 +59,7 @@ int main() {
             int aj = BLOCK_SIZE * gj;
 
             for (uint k = 0; k < BLOCK_SIZE; k++) {
-              bcol[k] = sg.load(marr.template get_multi_ptr<sycl::access::decorated::yes>() + (ai + k) * N + aj);
+              bcol[k] = sg.load(marr.get_pointer() + (ai + k) * N + aj);
             }
 
             uint tcol[BLOCK_SIZE];
@@ -72,7 +72,7 @@ int main() {
             }
 
             for (uint k = 0; k < BLOCK_SIZE; k++) {
-              sg.store(marr.template get_multi_ptr<sycl::access::decorated::yes>() + (ai + k) * N + aj, tcol[k]);
+              sg.store(marr.get_pointer() + (ai + k) * N + aj, tcol[k]);
             }
           });
     });
diff --git a/Publications/GPU-Opt-Guide/usm/usm-buffer.cpp b/Publications/GPU-Opt-Guide/usm/usm-buffer.cpp
@@ -5,7 +5,7 @@
 // =============================================================
 #include <iomanip>
 
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 
 #include "utils.hpp"
 
diff --git a/Publications/GPU-Opt-Guide/work-group-size/reduction-wg-size.cpp b/Publications/GPU-Opt-Guide/work-group-size/reduction-wg-size.cpp
@@ -3,10 +3,10 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <chrono>
 #include <iostream>
 #include <string>
+#include <sycl/sycl.hpp>
 #include <unistd.h>
 #include <vector>
 
diff --git a/Publications/GPU-Opt-Guide/work-group-size/vec-copy.cpp b/Publications/GPU-Opt-Guide/work-group-size/vec-copy.cpp
@@ -3,10 +3,10 @@
 //
 // SPDX-License-Identifier: MIT
 // =============================================================
-#include <CL/sycl.hpp>
 #include <chrono>
 #include <iostream>
 #include <string>
+#include <sycl/sycl.hpp>
 #include <unistd.h>
 #include <vector>
 
