From 834d27d45e7e5366d7edcd8fdee8fb7f9be8d4fe Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Thu, 7 Jul 2016 18:15:03 +0000 Subject: [PATCH] [CUDA] Rename the __nvvm_bar0 builtin back to __syncthreads. The builtin was renamed in r274770. But __syncthreads is part of our user-facing API, so we need to keep the name as-is. Patch by Justin Bogner. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@274780 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/BuiltinsNVPTX.def | 2 +- test/CodeGen/builtins-nvptx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/clang/Basic/BuiltinsNVPTX.def b/include/clang/Basic/BuiltinsNVPTX.def index acfed606d5..456d0001a1 100644 --- a/include/clang/Basic/BuiltinsNVPTX.def +++ b/include/clang/Basic/BuiltinsNVPTX.def @@ -393,7 +393,7 @@ BUILTIN(__nvvm_bitcast_d2ll, "LLid", "") // Sync -BUILTIN(__nvvm_bar0, "v", "") +BUILTIN(__syncthreads, "v", "") BUILTIN(__nvvm_bar0_popc, "ii", "") BUILTIN(__nvvm_bar0_and, "ii", "") BUILTIN(__nvvm_bar0_or, "ii", "") diff --git a/test/CodeGen/builtins-nvptx.c b/test/CodeGen/builtins-nvptx.c index 2cb0ff3e37..cd21361140 100644 --- a/test/CodeGen/builtins-nvptx.c +++ b/test/CodeGen/builtins-nvptx.c @@ -179,7 +179,7 @@ __device__ void nvvm_math(float f1, float f2, double d1, double d2) { // CHECK: call void @llvm.nvvm.membar.sys() __nvvm_membar_sys(); // CHECK: call void @llvm.nvvm.barrier0() - __nvvm_bar0(); + __syncthreads(); } __device__ int di; -- 2.50.1