diff options
| author | Justin Bogner <mail@justinbogner.com> | 2016-07-06 19:52:32 +0000 |
|---|---|---|
| committer | Justin Bogner <mail@justinbogner.com> | 2016-07-06 19:52:32 +0000 |
| commit | 5d5b12000a4c55f678ee6cc9f0272099950f0db5 (patch) | |
| tree | e0ee2ed886187266ebc8406e2ba3e96dae500025 | |
| parent | 2ef0b43b260627a61af279a0d9cb31933400f665 (diff) | |
| download | clang-5d5b12000a4c55f678ee6cc9f0272099950f0db5.tar.gz | |
NVPTX: Rename __builtin_ptx_shfl -> __nvvm_shfl
To match "NVPTX: Make the llvm.nvvm.shfl intrinsics and builtin names
consistent" in LLVM.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@274663 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/BuiltinsNVPTX.def | 16 | ||||
| -rw-r--r-- | lib/Headers/__clang_cuda_intrinsics.h | 12 |
2 files changed, 12 insertions, 16 deletions
diff --git a/include/clang/Basic/BuiltinsNVPTX.def b/include/clang/Basic/BuiltinsNVPTX.def index bb02c2aa8b..48aa14bbfe 100644 --- a/include/clang/Basic/BuiltinsNVPTX.def +++ b/include/clang/Basic/BuiltinsNVPTX.def @@ -404,14 +404,14 @@ BUILTIN(__nvvm_bar0_or, "ii", "") // Shuffle -BUILTIN(__builtin_ptx_shfl_down_i32, "iiii", "") -BUILTIN(__builtin_ptx_shfl_down_f32, "ffii", "") -BUILTIN(__builtin_ptx_shfl_up_i32, "iiii", "") -BUILTIN(__builtin_ptx_shfl_up_f32, "ffii", "") -BUILTIN(__builtin_ptx_shfl_bfly_i32, "iiii", "") -BUILTIN(__builtin_ptx_shfl_bfly_f32, "ffii", "") -BUILTIN(__builtin_ptx_shfl_idx_i32, "iiii", "") -BUILTIN(__builtin_ptx_shfl_idx_f32, "ffii", "") +BUILTIN(__nvvm_shfl_down_i32, "iiii", "") +BUILTIN(__nvvm_shfl_down_f32, "ffii", "") +BUILTIN(__nvvm_shfl_up_i32, "iiii", "") +BUILTIN(__nvvm_shfl_up_f32, "ffii", "") +BUILTIN(__nvvm_shfl_bfly_i32, "iiii", "") +BUILTIN(__nvvm_shfl_bfly_f32, "ffii", "") +BUILTIN(__nvvm_shfl_idx_i32, "iiii", "") +BUILTIN(__nvvm_shfl_idx_f32, "ffii", "") // Membar diff --git a/lib/Headers/__clang_cuda_intrinsics.h b/lib/Headers/__clang_cuda_intrinsics.h index de5171720c..3df41fa290 100644 --- a/lib/Headers/__clang_cuda_intrinsics.h +++ b/lib/Headers/__clang_cuda_intrinsics.h @@ -81,16 +81,12 @@ return __out; \ } -__MAKE_SHUFFLES(__shfl, __builtin_ptx_shfl_idx_i32, __builtin_ptx_shfl_idx_f32, - 0x1f); +__MAKE_SHUFFLES(__shfl, __nvvm_shfl_idx_i32, __nvvm_shfl_idx_f32, 0x1f); // We use 0 rather than 31 as our mask, because shfl.up applies to lanes >= // maxLane. -__MAKE_SHUFFLES(__shfl_up, __builtin_ptx_shfl_up_i32, __builtin_ptx_shfl_up_f32, - 0); -__MAKE_SHUFFLES(__shfl_down, __builtin_ptx_shfl_down_i32, - __builtin_ptx_shfl_down_f32, 0x1f); -__MAKE_SHUFFLES(__shfl_xor, __builtin_ptx_shfl_bfly_i32, - __builtin_ptx_shfl_bfly_f32, 0x1f); +__MAKE_SHUFFLES(__shfl_up, __nvvm_shfl_up_i32, __nvvm_shfl_up_f32, 0); +__MAKE_SHUFFLES(__shfl_down, __nvvm_shfl_down_i32, __nvvm_shfl_down_f32, 0x1f); +__MAKE_SHUFFLES(__shfl_xor, __nvvm_shfl_bfly_i32, __nvvm_shfl_bfly_f32, 0x1f); #pragma pop_macro("__MAKE_SHUFFLES") |