https://github.com/jayfoad created
https://github.com/llvm/llvm-project/pull/78711
This was already done for LLVM. This patch just updates the Clang
builtin handling to match.
>From 8ec83bbc08c6a364efda3724d5886dbd568f956f Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.f...@amd.com>
Date: Fri, 19 Jan 2024 13:34:37 +0000
Subject: [PATCH] [AMDGPU] Remove gws feature from GFX12
This was already done for LLVM. This patch just updates the Clang
builtin handling to match.
---
.../builtins-amdgcn-gfx12-err.cl | 27 ++++++-------------
.../builtins-amdgcn-gfx12-param-err.cl | 24 +++++++++++++++++
llvm/lib/TargetParser/TargetParser.cpp | 1 -
3 files changed, 32 insertions(+), 20 deletions(-)
create mode 100644 clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-param-err.cl
diff --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-err.cl
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-err.cl
index 5e0153c42825e3..bcaea9a2482d18 100644
--- a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-err.cl
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-err.cl
@@ -2,23 +2,12 @@
// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1200 -verify
-S -emit-llvm -o - %s
-kernel void builtins_amdgcn_s_barrier_signal_err(global int* in, global int*
out, int barrier) {
-
- __builtin_amdgcn_s_barrier_signal(barrier); // expected-error
{{'__builtin_amdgcn_s_barrier_signal' must be a constant integer}}
- __builtin_amdgcn_s_barrier_wait(-1);
- *out = *in;
-}
-
-kernel void builtins_amdgcn_s_barrier_wait_err(global int* in, global int*
out, int barrier) {
-
- __builtin_amdgcn_s_barrier_signal(-1);
- __builtin_amdgcn_s_barrier_wait(barrier); // expected-error
{{'__builtin_amdgcn_s_barrier_wait' must be a constant integer}}
- *out = *in;
-}
-
-kernel void builtins_amdgcn_s_barrier_signal_isfirst_err(global int* in,
global int* out, int barrier) {
-
- __builtin_amdgcn_s_barrier_signal_isfirst(barrier); // expected-error
{{'__builtin_amdgcn_s_barrier_signal_isfirst' must be a constant integer}}
- __builtin_amdgcn_s_barrier_wait(-1);
- *out = *in;
+typedef unsigned int uint;
+
+kernel void test_builtins_amdgcn_gws_insts(uint a, uint b) {
+ __builtin_amdgcn_ds_gws_init(a, b); // expected-error
{{'__builtin_amdgcn_ds_gws_init' needs target feature gws}}
+ __builtin_amdgcn_ds_gws_barrier(a, b); // expected-error
{{'__builtin_amdgcn_ds_gws_barrier' needs target feature gws}}
+ __builtin_amdgcn_ds_gws_sema_v(a); // expected-error
{{'__builtin_amdgcn_ds_gws_sema_v' needs target feature gws}}
+ __builtin_amdgcn_ds_gws_sema_br(a, b); // expected-error
{{'__builtin_amdgcn_ds_gws_sema_br' needs target feature gws}}
+ __builtin_amdgcn_ds_gws_sema_p(a); // expected-error
{{'__builtin_amdgcn_ds_gws_sema_p' needs target feature gws}}
}
diff --git a/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-param-err.cl
b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-param-err.cl
new file mode 100644
index 00000000000000..5e0153c42825e3
--- /dev/null
+++ b/clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-param-err.cl
@@ -0,0 +1,24 @@
+// REQUIRES: amdgpu-registered-target
+
+// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -target-cpu gfx1200 -verify
-S -emit-llvm -o - %s
+
+kernel void builtins_amdgcn_s_barrier_signal_err(global int* in, global int*
out, int barrier) {
+
+ __builtin_amdgcn_s_barrier_signal(barrier); // expected-error
{{'__builtin_amdgcn_s_barrier_signal' must be a constant integer}}
+ __builtin_amdgcn_s_barrier_wait(-1);
+ *out = *in;
+}
+
+kernel void builtins_amdgcn_s_barrier_wait_err(global int* in, global int*
out, int barrier) {
+
+ __builtin_amdgcn_s_barrier_signal(-1);
+ __builtin_amdgcn_s_barrier_wait(barrier); // expected-error
{{'__builtin_amdgcn_s_barrier_wait' must be a constant integer}}
+ *out = *in;
+}
+
+kernel void builtins_amdgcn_s_barrier_signal_isfirst_err(global int* in,
global int* out, int barrier) {
+
+ __builtin_amdgcn_s_barrier_signal_isfirst(barrier); // expected-error
{{'__builtin_amdgcn_s_barrier_signal_isfirst' must be a constant integer}}
+ __builtin_amdgcn_s_barrier_wait(-1);
+ *out = *in;
+}
diff --git a/llvm/lib/TargetParser/TargetParser.cpp
b/llvm/lib/TargetParser/TargetParser.cpp
index 2cfe23676d20f8..6bd477aed8fa64 100644
--- a/llvm/lib/TargetParser/TargetParser.cpp
+++ b/llvm/lib/TargetParser/TargetParser.cpp
@@ -295,7 +295,6 @@ void AMDGPU::fillAMDGPUFeatureMap(StringRef GPU, const
Triple &T,
Features["gfx12-insts"] = true;
Features["atomic-fadd-rtn-insts"] = true;
Features["image-insts"] = true;
- Features["gws"] = true;
break;
case GK_GFX1151:
case GK_GFX1150:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
