From b8c5e00d0d0966f5153dbf8638e759c6d0481f91 Mon Sep 17 00:00:00 2001 From: Yanfeng Xiao Date: Tue, 2 Apr 2024 23:24:10 -0700 Subject: [PATCH 1/3] [CI][Deps] Uplift CPU/FPGAEMU RT version to 2024.17.3.0.09 --- devops/dependencies.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/devops/dependencies.json b/devops/dependencies.json index 5297f823f9306..ed2138636caf3 100644 --- a/devops/dependencies.json +++ b/devops/dependencies.json @@ -32,21 +32,21 @@ "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu" }, "tbb": { - "github_tag": "v2021.10.0", - "version": "2021.10.0", - "url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.10.0/oneapi-tbb-2021.10.0-lin.tgz", + "github_tag": "v2021.11.0", + "version": "2021.11.0", + "url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.11.0/oneapi-tbb-2021.11.0-lin.tgz", "root": "{DEPS_ROOT}/tbb/lin" }, "oclcpu": { - "github_tag": "2023-WW46", - "version": "2023.16.10.0.17", - "url": "https://github.com/intel/llvm/releases/download/2023-WW46/oclcpuexp-2023.16.10.0.17_rel.tar.gz", + "github_tag": "2024-WW14", + "version": "2024.17.3.0.09", + "url": "https://github.com/intel/llvm/releases/download/2024-WW14/oclcpuexp-2024.17.3.0.09_rel.tar.gz", "root": "{DEPS_ROOT}/opencl/runtime/linux/oclcpu" }, "fpgaemu": { - "github_tag": "2023-WW46", - "version": "2023.16.10.0.17", - "url": "https://github.com/intel/llvm/releases/download/2023-WW46/fpgaemu-2023.16.10.0.17_rel.tar.gz", + "github_tag": "2024-WW14", + "version": "2024.17.3.0.09", + "url": "https://github.com/intel/llvm/releases/download/2024-WW14/fpgaemu-2024.17.3.0.09_rel.tar.gz", "root": "{DEPS_ROOT}/opencl/runtime/linux/oclfpgaemu" }, "fpga": { @@ -60,21 +60,21 @@ "root": "" }, "tbb": { - "github_tag": "v2021.10.0", - "version": "2021.10.0", - "url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.10.0/oneapi-tbb-2021.10.0-win.zip", + "github_tag": "v2021.11.0", + "version": "2021.11.0", + "url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.11.0/oneapi-tbb-2021.11.0-win.zip", "root": "{DEPS_ROOT}/tbb/win" }, "oclcpu": { - "github_tag": "2023-WW46", - "version": "2023.16.10.0.17", - "url": "https://github.com/intel/llvm/releases/download/2023-WW46/win-oclcpuexp-2023.16.10.0.17_rel.zip", + "github_tag": "2024-WW14", + "version": "2024.17.3.0.09", + "url": "https://github.com/intel/llvm/releases/download/2024-WW14/win-oclcpuexp-2024.17.3.0.09_rel.zip", "root": "{DEPS_ROOT}/opencl/runtime/linux/oclcpu" }, "fpgaemu": { - "github_tag": "2023-WW46", - "version": "2023.16.10.0.17", - "url": "https://github.com/intel/llvm/releases/download/2023-WW46/win-fpgaemu-2023.16.10.0.17_rel.zip", + "github_tag": "2024-WW14", + "version": "2024.17.3.0.09", + "url": "https://github.com/intel/llvm/releases/download/2024-WW14/win-fpgaemu-2024.17.3.0.09_rel.zip", "root": "{DEPS_ROOT}/opencl/runtime/linux/oclfpgaemu" }, "fpga": { From 0718010aa09aa38c682c6350a1dbe84cd0068490 Mon Sep 17 00:00:00 2001 From: Yanfeng Xiao Date: Thu, 11 Apr 2024 22:58:27 -0700 Subject: [PATCH 2/3] Remove XFAIL for 4 Matrix tests and add 2 XFAIL for Basic & KernelCompiler --- sycl/test-e2e/Basic/built-ins/marray_geometric.cpp | 1 + sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp | 1 + sycl/test-e2e/Matrix/SG32/get_coord_float_matC.cpp | 1 - sycl/test-e2e/Matrix/SG32/get_coord_int8_matA.cpp | 1 - sycl/test-e2e/Matrix/get_coord_float_matC.cpp | 1 - sycl/test-e2e/Matrix/get_coord_int8_matA.cpp | 1 - 6 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp b/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp index 361772669bb3e..62c7fef13bc09 100644 --- a/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp +++ b/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp @@ -2,6 +2,7 @@ // RUN: %{run} %t.out // RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %} // RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out %} +// XFAIL: cpu #include "helpers.hpp" diff --git a/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp b/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp index 6eb31e015610a..36153746986d9 100644 --- a/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp +++ b/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp @@ -10,6 +10,7 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out %S/Kernels/kernels.spv %S/Kernels/kernels_fp16.spv %S/Kernels/kernels_fp64.spv +// XFAIL: cpu // Test case for the sycl_ext_oneapi_kernel_compiler_spirv extension. This test // loads pre-compiled kernels from a SPIR-V file and runs them. diff --git a/sycl/test-e2e/Matrix/SG32/get_coord_float_matC.cpp b/sycl/test-e2e/Matrix/SG32/get_coord_float_matC.cpp index c9df3ad36f033..3bdd2ed83b08d 100644 --- a/sycl/test-e2e/Matrix/SG32/get_coord_float_matC.cpp +++ b/sycl/test-e2e/Matrix/SG32/get_coord_float_matC.cpp @@ -10,7 +10,6 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// XFAIL: cpu #include "../common.hpp" #include diff --git a/sycl/test-e2e/Matrix/SG32/get_coord_int8_matA.cpp b/sycl/test-e2e/Matrix/SG32/get_coord_int8_matA.cpp index f8c4ca833c50e..79383fce4b7fc 100644 --- a/sycl/test-e2e/Matrix/SG32/get_coord_int8_matA.cpp +++ b/sycl/test-e2e/Matrix/SG32/get_coord_int8_matA.cpp @@ -10,7 +10,6 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// XFAIL: cpu #include "../common.hpp" #include diff --git a/sycl/test-e2e/Matrix/get_coord_float_matC.cpp b/sycl/test-e2e/Matrix/get_coord_float_matC.cpp index 015dda8e75475..78a6f815df19c 100644 --- a/sycl/test-e2e/Matrix/get_coord_float_matC.cpp +++ b/sycl/test-e2e/Matrix/get_coord_float_matC.cpp @@ -9,7 +9,6 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// XFAIL: cpu #include "common.hpp" #include diff --git a/sycl/test-e2e/Matrix/get_coord_int8_matA.cpp b/sycl/test-e2e/Matrix/get_coord_int8_matA.cpp index 567d0831d3d19..6500a34f48119 100644 --- a/sycl/test-e2e/Matrix/get_coord_int8_matA.cpp +++ b/sycl/test-e2e/Matrix/get_coord_int8_matA.cpp @@ -9,7 +9,6 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// XFAIL: cpu #include "common.hpp" #include From 9091626164f772c09f016fce2d68ab80d4fdc11c Mon Sep 17 00:00:00 2001 From: Yanfeng Xiao Date: Mon, 15 Apr 2024 19:32:21 -0700 Subject: [PATCH 3/3] Add comments with github issue id for XFAIL'd tests --- sycl/test-e2e/Basic/built-ins/marray_geometric.cpp | 1 + sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp b/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp index 7a386c2e23d08..8416eae513b68 100644 --- a/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp +++ b/sycl/test-e2e/Basic/built-ins/marray_geometric.cpp @@ -1,5 +1,6 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out +// TODO: Remove XFAIL after fixing https://github.com/intel/llvm/issues/13397 // XFAIL: cpu #include "helpers.hpp" diff --git a/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp b/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp index 36153746986d9..cd54de947eee5 100644 --- a/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp +++ b/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp @@ -10,6 +10,7 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out %S/Kernels/kernels.spv %S/Kernels/kernels_fp16.spv %S/Kernels/kernels_fp64.spv +// TODO: Remove XFAIL after fixing https://github.com/intel/llvm/issues/13397 // XFAIL: cpu // Test case for the sycl_ext_oneapi_kernel_compiler_spirv extension. This test