Justin Bogner via cfe-commits <cfe-commits@lists.llvm.org> writes: > Author: bogner > Date: Wed Jul 6 14:52:32 2016 > New Revision: 274663 > > URL: http://llvm.org/viewvc/llvm-project?rev=274663&view=rev > Log: > NVPTX: Rename __builtin_ptx_shfl -> __nvvm_shfl > > To match "NVPTX: Make the llvm.nvvm.shfl intrinsics and builtin names > consistent" in LLVM.
Forgot to update the commit message - this is to match r274662. > Modified: > cfe/trunk/include/clang/Basic/BuiltinsNVPTX.def > cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h > > Modified: cfe/trunk/include/clang/Basic/BuiltinsNVPTX.def > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/BuiltinsNVPTX.def?rev=274663&r1=274662&r2=274663&view=diff > ============================================================================== > --- cfe/trunk/include/clang/Basic/BuiltinsNVPTX.def (original) > +++ cfe/trunk/include/clang/Basic/BuiltinsNVPTX.def Wed Jul 6 14:52:32 2016 > @@ -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 > > > Modified: cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h?rev=274663&r1=274662&r2=274663&view=diff > ============================================================================== > --- cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h (original) > +++ cfe/trunk/lib/Headers/__clang_cuda_intrinsics.h Wed Jul 6 14:52:32 2016 > @@ -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") > > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
