[clang][IR] Overload @llvm.thread.pointer to support non-AS0 targets

Author: jrtc27

llvm/lib/IR/AutoUpgrade.cpp

@@ -1336,8 +1336,8 @@ static bool UpgradeIntrinsicFunction1(Function *F, Function *&NewFn) {
 
   case 't':
     if (Name == "thread.pointer") {
-      NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::thread_pointer,
-                                        F->getReturnType());
+      NewFn = Intrinsic::getDeclaration(
+          F->getParent(), Intrinsic::thread_pointer, F->getReturnType());
       return true;
     }
     break;

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

@@ -17981,12 +17981,14 @@ bool RISCVTargetLowering::preferScalarizeSplat(SDNode *N) const {
 
 static Value *useTpOffset(IRBuilderBase &IRB, unsigned Offset) {
   Module *M = IRB.GetInsertBlock()->getParent()->getParent();
-  Function *ThreadPointerFunc = Intrinsic::getDeclaration(
-      M, Intrinsic::thread_pointer, IRB.getInt8PtrTy());
+  unsigned AS = M->getDataLayout().getGlobalsAddressSpace();
+  Function *ThreadPointerFunc =
+      Intrinsic::getDeclaration(M, Intrinsic::thread_pointer,
+                                IRB.getInt8PtrTy(AS));
   return IRB.CreatePointerCast(
       IRB.CreateConstGEP1_32(IRB.getInt8Ty(),
                              IRB.CreateCall(ThreadPointerFunc), Offset),
-      IRB.getInt8PtrTy()->getPointerTo(0));
+      IRB.getInt8PtrTy()->getPointerTo(AS));
 }
 
 Value *RISCVTargetLowering::getIRStackGuard(IRBuilderBase &IRB) const {

llvm/test/Assembler/autoupgrade-thread-pointer.ll

@@ -7,7 +7,7 @@ declare ptr @llvm.arm.thread.pointer()
 define ptr @test1() {
 ; CHECK: test1()
 ; CHECK: call ptr @llvm.thread.pointer.p0()
-  %1 = call i8* @llvm.aarch64.thread.pointer()
+  %1 = call ptr @llvm.aarch64.thread.pointer()
   ret ptr %1
 }
 

llvm/test/CodeGen/RISCV/cheri/thread-pointer.ll

@@ -0,0 +1,14 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: %riscv32_cheri_purecap_llc < %s | FileCheck %s
+; RUN: %riscv64_cheri_purecap_llc < %s | FileCheck %s
+
+declare ptr addrspace(200) @llvm.thread.pointer.p200()
+
+define ptr addrspace(200) @thread_pointer() nounwind {
+; CHECK-LABEL: thread_pointer:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    cmove ca0, ctp
+; CHECK-NEXT:    ret
+  %1 = tail call ptr addrspace(200) @llvm.thread.pointer.p200()
+  ret ptr addrspace(200) %1
+}

llvm/unittests/Transforms/Vectorize/VPlanTest.cpp

@@ -1175,8 +1175,10 @@ TEST(VPRecipeTest, MayHaveSideEffectsAndMayReadWriteMemory) {
     // Test for a call to a function without side-effects.
     LLVMContext C;
     Module M("", C);
+    IntegerType *Int8 = IntegerType::get(C, 8);
+    PointerType *Int8Ptr = PointerType::get(Int8, 0);
     Function *TheFn = Intrinsic::getDeclaration(&M, Intrinsic::thread_pointer,
-                                                llvm::PointerType::get(C, 0));
+                                                Int8Ptr);
 
     auto *Call = CallInst::Create(TheFn->getFunctionType(), TheFn);
     VPValue Op1;