From b69d765c68e5b3f2ce730777a26392dba3882056 Mon Sep 17 00:00:00 2001 From: PietroGhg Date: Wed, 18 Sep 2024 08:19:43 +0100 Subject: [PATCH 1/3] Update Native CPU attributes test --- sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp b/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp index 63cfa084eee77..30d63de7984c2 100644 --- a/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp +++ b/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp @@ -11,8 +11,6 @@ int main() { deviceQueue.submit([&](handler &h) { h.parallel_for( r, [=](nd_item<2> it) { - it.barrier(access::fence_space::local_space); - //CHECK-DAG: call void @__mux_work_group_barrier({{.*}}) atomic_fence(memory_order::acquire, memory_scope::work_group); //CHECK-DAG: call void @__mux_mem_barrier({{.*}}) }); @@ -20,8 +18,5 @@ int main() { } -//CHECK-DAG: define{{.*}}@__mux_work_group_barrier{{.*}}#[[ATTR:[0-9]+]] -//CHECK-DAG: [[ATTR]]{{.*}}convergent - //CHECK-DAG: define{{.*}}@__mux_mem_barrier{{.*}}#[[ATTR_MEM:[0-9]+]] //CHECK-DAG: [[ATTR_MEM]]{{.*}}convergent From 5f529b7ec724b91a31ebaabfa9206c2a8ac07d7e Mon Sep 17 00:00:00 2001 From: PietroGhg Date: Thu, 19 Sep 2024 10:56:05 +0100 Subject: [PATCH 2/3] CHECK-NOT for work group barrier --- sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp b/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp index 30d63de7984c2..a2ea658dd2e24 100644 --- a/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp +++ b/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp @@ -18,5 +18,7 @@ int main() { } +//CHECK-NOT: @__mux_work_group_barrier + //CHECK-DAG: define{{.*}}@__mux_mem_barrier{{.*}}#[[ATTR_MEM:[0-9]+]] //CHECK-DAG: [[ATTR_MEM]]{{.*}}convergent From 85bfc2ca44aae0fa8ef6a78252a58d4f765093ba Mon Sep 17 00:00:00 2001 From: PietroGhg Date: Thu, 19 Sep 2024 15:23:15 +0100 Subject: [PATCH 3/3] Add comment and fix check directive --- .../native_cpu/native_cpu_attrs.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp b/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp index a2ea658dd2e24..3478ee0377f77 100644 --- a/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp +++ b/sycl/test/check_device_code/native_cpu/native_cpu_attrs.cpp @@ -1,5 +1,7 @@ // REQUIRES: native_cpu_ock -// RUN: %clangxx -fsycl -fsycl-targets=native_cpu -Xclang -sycl-std=2020 -mllvm -sycl-native-dump-device-ir %s | FileCheck %s +// RUN: %clangxx -fsycl -fsycl-targets=native_cpu -Xclang -sycl-std=2020 -mllvm -sycl-native-dump-device-ir %s &> %t.ll +// RUN: FileCheck %s --input-file %t.ll --check-prefix=CHECK-WG-BARRIER +// RUN: FileCheck %s --input-file %t.ll #include "sycl.hpp" using namespace sycl; @@ -18,7 +20,10 @@ int main() { } -//CHECK-NOT: @__mux_work_group_barrier +// Currently Native CPU uses the WorkItemLoops pass from the oneAPI +// Construction Kit to materialize barriers, so the builtin shouldn't +// be referenced anymore in the module. +// CHECK-WG-BARRIER-NOT: @__mux_work_group_barrier -//CHECK-DAG: define{{.*}}@__mux_mem_barrier{{.*}}#[[ATTR_MEM:[0-9]+]] -//CHECK-DAG: [[ATTR_MEM]]{{.*}}convergent +// CHECK-DAG: define{{.*}}@__mux_mem_barrier{{.*}}#[[ATTR_MEM:[0-9]+]] +// CHECK-DAG: [[ATTR_MEM]]{{.*}}convergent