From: Justin Bogner <mail@justinbogner.com>
Date: Wed, 6 Jul 2016 19:52:32 +0000 (+0000)
Subject: NVPTX: Rename __builtin_ptx_shfl -> __nvvm_shfl
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d5b12000a4c55f678ee6cc9f0272099950f0db5;p=clang

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
---

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")