Author: Juan Manuel Martinez Caamaño Date: 2025-12-16T09:52:07+01:00 New Revision: c0e72f6911303fb015cd53cebd8050bfc250b90f
URL: https://github.com/llvm/llvm-project/commit/c0e72f6911303fb015cd53cebd8050bfc250b90f DIFF: https://github.com/llvm/llvm-project/commit/c0e72f6911303fb015cd53cebd8050bfc250b90f.diff LOG: [Clang] Remove 't' from __builtin_amdgcn_ds_atomic_fadd_f32/f64 (#172293) Allows for type checking depending on the builtin signature. Added: clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl Modified: clang/include/clang/Basic/BuiltinsAMDGPU.def Removed: ################################################################################ diff --git a/clang/include/clang/Basic/BuiltinsAMDGPU.def b/clang/include/clang/Basic/BuiltinsAMDGPU.def index a867144d83928..88b306462a92c 100644 --- a/clang/include/clang/Basic/BuiltinsAMDGPU.def +++ b/clang/include/clang/Basic/BuiltinsAMDGPU.def @@ -276,8 +276,8 @@ TARGET_BUILTIN(__builtin_amdgcn_flat_atomic_fadd_f64, "dd*0d", "t", "gfx90a-inst TARGET_BUILTIN(__builtin_amdgcn_flat_atomic_fmin_f64, "dd*0d", "t", "gfx90a-insts") TARGET_BUILTIN(__builtin_amdgcn_flat_atomic_fmax_f64, "dd*0d", "t", "gfx90a-insts") -TARGET_BUILTIN(__builtin_amdgcn_ds_atomic_fadd_f64, "dd*3d", "t", "gfx90a-insts") -TARGET_BUILTIN(__builtin_amdgcn_ds_atomic_fadd_f32, "ff*3f", "t", "gfx8-insts") +TARGET_BUILTIN(__builtin_amdgcn_ds_atomic_fadd_f64, "dd*3d", "", "gfx90a-insts") +TARGET_BUILTIN(__builtin_amdgcn_ds_atomic_fadd_f32, "ff*3f", "", "gfx8-insts") TARGET_BUILTIN(__builtin_amdgcn_flat_atomic_fadd_f32, "ff*0f", "t", "gfx940-insts") TARGET_BUILTIN(__builtin_amdgcn_flat_atomic_fadd_v2f16, "V2hV2h*0V2h", "t", "atomic-flat-pk-add-16-insts") diff --git a/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip b/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip new file mode 100644 index 0000000000000..840b26e52cc25 --- /dev/null +++ b/clang/test/SemaHIP/amdgpu-ds-atomic-fadd-err.hip @@ -0,0 +1,33 @@ +// RUN: %clang_cc1 -fsyntax-only -triple amdgcn -target-cpu gfx90a -verify=device,both %s -fcuda-is-device +// RUN: %clang_cc1 -fsyntax-only -triple x86_64 -aux-triple amdgcn -verify=host,both %s + +#define __device__ __attribute__((device)) +#define __shared__ __attribute__((shared)) + +__device__ void test_ds_atomic_fadd_f32_valid(__shared__ float *lds_ptr, float val) { + float result; + result = __builtin_amdgcn_ds_atomic_fadd_f32(lds_ptr, val); +} + +__device__ void test_ds_atomic_fadd_f32_errors(__shared__ float *lds_ptr, float val, + __shared__ double *lds_ptr_d, + float *global_ptr) { + float result; + result = __builtin_amdgcn_ds_atomic_fadd_f32(lds_ptr, val, 0); // both-error{{too many arguments to function call, expected 2, have 3}} + result = __builtin_amdgcn_ds_atomic_fadd_f32(global_ptr, val); + result = __builtin_amdgcn_ds_atomic_fadd_f32(lds_ptr_d, val); // device-error{{cannot initialize a parameter of type '__shared__ float *' with an rvalue of type '__shared__ double *'}} host-error{{cannot initialize a parameter of type '__attribute__((address_space(3))) float *' with an rvalue of type '__attribute__((address_space(3))) double *'}} +} + +__device__ void test_ds_atomic_fadd_f64_valid(__shared__ double *lds_ptr, double val) { + double result; + result = __builtin_amdgcn_ds_atomic_fadd_f64(lds_ptr, val); +} + +__device__ void test_ds_atomic_fadd_f64_errors(__shared__ double *lds_ptr, double val, + __shared__ float *lds_ptr_f, + double *global_ptr) { + double result; + result = __builtin_amdgcn_ds_atomic_fadd_f64(lds_ptr, val, 0); // both-error{{too many arguments to function call, expected 2, have 3}} + result = __builtin_amdgcn_ds_atomic_fadd_f64(global_ptr, val); + result = __builtin_amdgcn_ds_atomic_fadd_f64(lds_ptr_f, val); // device-error{{cannot initialize a parameter of type '__shared__ double *' with an rvalue of type '__shared__ float *'}} host-error{{cannot initialize a parameter of type '__attribute__((address_space(3))) double *' with an rvalue of type '__attribute__((address_space(3))) float *'}} +} diff --git a/clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl b/clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl new file mode 100644 index 0000000000000..65f6c01d283ae --- /dev/null +++ b/clang/test/SemaOpenCL/amdgpu-ds-atomic-fadd-err.cl @@ -0,0 +1,29 @@ +// RUN: %clang_cc1 -fsyntax-only -cl-std=CL2.0 -triple amdgcn -target-cpu gfx90a -verify %s + +kernel void test_ds_atomic_fadd_f32_valid(__local float *lds_ptr, float val) { + float result; + result = __builtin_amdgcn_ds_atomic_fadd_f32(lds_ptr, val); +} + +kernel void test_ds_atomic_fadd_f32_errors(__local float *lds_ptr, float val, + __local double *lds_ptr_d, + __global float *global_ptr) { + float result; + result = __builtin_amdgcn_ds_atomic_fadd_f32(lds_ptr, val, 0); // expected-error{{too many arguments to function call, expected 2, have 3}} + result = __builtin_amdgcn_ds_atomic_fadd_f32(global_ptr, val); // expected-error{{passing '__global float *__private' to parameter of type '__local float *' changes address space of pointer}} + result = __builtin_amdgcn_ds_atomic_fadd_f32(lds_ptr_d, val); // expected-error{{incompatible pointer types passing '__local double *__private' to parameter of type '__local float *'}} +} + +kernel void test_ds_atomic_fadd_f64_valid(__local double *lds_ptr, double val) { + double result; + result = __builtin_amdgcn_ds_atomic_fadd_f64(lds_ptr, val); +} + +kernel void test_ds_atomic_fadd_f64_errors(__local double *lds_ptr, double val, + __local float *lds_ptr_f, + __global double *global_ptr) { + double result; + result = __builtin_amdgcn_ds_atomic_fadd_f64(lds_ptr, val, 0); // expected-error{{too many arguments to function call, expected 2, have 3}} + result = __builtin_amdgcn_ds_atomic_fadd_f64(global_ptr, val);// expected-error{{passing '__global double *__private' to parameter of type '__local double *' changes address space of pointer}} + result = __builtin_amdgcn_ds_atomic_fadd_f64(lds_ptr_f, val); // expected-error{{incompatible pointer types passing '__local float *__private' to parameter of type '__local double *'}} +} _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
