@@ -1262,65 +1262,6 @@ Value *SPIRVToLLVM::oclTransConstantPipeStorage(
12621262 GlobalValue::NotThreadLocal, SPIRAS_Global);
12631263}
12641264
1265- namespace {
1266-
1267- // A pointer annotation may have been generated for the operand. If the operand
1268- // is used further in IR, it should be replaced with the intrinsic call result.
1269- // Otherwise, the generated pointer annotation call is left unused.
1270- static void replaceOperandWithAnnotationIntrinsicCallResult (Function *F,
1271- Value *&V) {
1272-
1273- SPIRVDBG (spvdbgs () << " \n "
1274- << " -------- REPLACE --------" ' \n '
1275- SPIRVDBG (dbgs () << " value: " ' \n '
1276-
1277- Value *BaseValue = nullptr ;
1278- IntrinsicInst *CallResult = nullptr ;
1279-
1280- auto SearchPtrAnn = [=](Value *BV, IntrinsicInst *&CR) {
1281- CR = nullptr ;
1282- for (auto *Use : BV->users ()) {
1283- if (auto *II = dyn_cast<IntrinsicInst>(Use)) {
1284- if (II->getIntrinsicID () == Intrinsic::ptr_annotation &&
1285- II->getType () == BV->getType ())
1286- CR = II;
1287- }
1288- }
1289- return CR ? true : false ;
1290- };
1291-
1292- if (SearchPtrAnn (V, CallResult)) {
1293- BaseValue = V;
1294- } else {
1295- // scan def-use chain, skip bitcast and addrspacecast
1296- // search for the closest floating ptr.annotation
1297- auto *Inst = dyn_cast<Instruction>(V);
1298- while (Inst && (isa<BitCastInst>(Inst) || isa<AddrSpaceCastInst>(Inst))) {
1299- if ((Inst = dyn_cast<Instruction>(Inst->getOperand (0 ))) &&
1300- SearchPtrAnn (Inst, CallResult)) {
1301- BaseValue = Inst;
1302- break ;
1303- }
1304- }
1305- }
1306-
1307- // overwrite operand with intrinsic call result
1308- if (CallResult) {
1309- SPIRVDBG (dbgs () << " BaseValue: " ' \n '
1310- << " CallResult: " ' \n '
1311- DominatorTree DT (*F);
1312- BaseValue->replaceUsesWithIf (CallResult, [&DT, &CallResult](Use &U) {
1313- return DT.dominates (CallResult, U);
1314- });
1315-
1316- // overwrite V
1317- if (V == BaseValue)
1318- V = CallResult;
1319- }
1320- }
1321-
1322- } // namespace
1323-
13241265// Translate aliasing memory access masks for SPIRVLoad and SPIRVStore
13251266// instructions. These masks are mapped on alias.scope and noalias
13261267// metadata in LLVM. Translation of optional string operand isn't yet supported
@@ -1798,10 +1739,6 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
17981739 StoreInst *SI = nullptr ;
17991740 auto *Src = transValue (BS->getSrc (), F, BB);
18001741 auto *Dst = transValue (BS->getDst (), F, BB);
1801- // A ptr.annotation may have been generated for the source variable.
1802- replaceOperandWithAnnotationIntrinsicCallResult (F, Src);
1803- // A ptr.annotation may have been generated for the destination variable.
1804- replaceOperandWithAnnotationIntrinsicCallResult (F, Dst);
18051742
18061743 bool isVolatile = BS->SPIRVMemoryAccess ::isVolatile ();
18071744 uint64_t AlignValue = BS->SPIRVMemoryAccess ::getAlignment ();
@@ -1818,8 +1755,6 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
18181755 case OpLoad: {
18191756 SPIRVLoad *BL = static_cast <SPIRVLoad *>(BV);
18201757 auto *V = transValue (BL->getSrc (), F, BB);
1821- // A ptr.annotation may have been generated for the source variable.
1822- replaceOperandWithAnnotationIntrinsicCallResult (F, V);
18231758
18241759 Type *Ty = transType (BL->getType ());
18251760 LoadInst *LI = nullptr ;
@@ -1847,14 +1782,8 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
18471782 bool IsVolatile = BC->SPIRVMemoryAccess ::isVolatile ();
18481783 IRBuilder<> Builder (BB);
18491784
1850- // A ptr.annotation may have been generated for the destination variable.
1851- replaceOperandWithAnnotationIntrinsicCallResult (F, Dst);
1852-
18531785 if (!CI) {
18541786 llvm::Value *Src = transValue (BC->getSource (), F, BB);
1855-
1856- // A ptr.annotation may have been generated for the source variable.
1857- replaceOperandWithAnnotationIntrinsicCallResult (F, Src);
18581787 CI = Builder.CreateMemCpy (Dst, Align, Src, Align, Size, IsVolatile);
18591788 }
18601789 if (isFuncNoUnwind ())
@@ -2401,9 +2330,6 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
24012330 std::vector<Value *> Args = transValue (BC->getArgumentValues (), F, BB);
24022331 auto *Call = CallInst::Create (transFunction (BC->getFunction ()), Args,
24032332 BC->getName (), BB);
2404- for (auto *Arg : Args)
2405- if (Arg->getType ()->isPointerTy ())
2406- replaceOperandWithAnnotationIntrinsicCallResult (F, Arg);
24072333 setCallingConv (Call);
24082334 setAttrByCalledFunc (Call);
24092335 return mapValue (BV, Call);
@@ -3693,6 +3619,7 @@ void SPIRVToLLVM::transIntelFPGADecorations(SPIRVValue *BV, Value *V) {
36933619 for (SPIRVWord I = 0 ; I < STS->getMemberCount (); ++I) {
36943620 std::vector<SmallString<256 >> AnnotStrVec;
36953621 generateIntelFPGAAnnotationForStructMember (ST, I, AnnotStrVec);
3622+ CallInst *AnnotationCall = nullptr ;
36963623 for (const auto &AnnotStr : AnnotStrVec) {
36973624 auto *GS = Builder.CreateGlobalStringPtr (AnnotStr);
36983625
@@ -3727,14 +3654,17 @@ void SPIRVToLLVM::transIntelFPGADecorations(SPIRVValue *BV, Value *V) {
37273654 PtrAnnFirstArg->getName ()),
37283655 Builder.CreateBitCast (GS, Int8PtrTyPrivate), UndefInt8Ptr,
37293656 UndefInt32, UndefInt8Ptr};
3730- auto *PtrAnnotationCall = Builder.CreateCall (AnnotationFn, Args);
3731- GEPOrUseMap[AL][I] = PtrAnnotationCall ;
3657+ AnnotationCall = Builder.CreateCall (AnnotationFn, Args);
3658+ GEPOrUseMap[AL][I] = AnnotationCall ;
37323659 }
3660+ if (AnnotationCall)
3661+ ValueMap[BV] = AnnotationCall;
37333662 }
37343663 }
37353664
37363665 std::vector<SmallString<256 >> AnnotStrVec;
37373666 generateIntelFPGAAnnotation (BV, AnnotStrVec);
3667+ CallInst *AnnotationCall = nullptr ;
37383668 for (const auto &AnnotStr : AnnotStrVec) {
37393669 Constant *GS = nullptr ;
37403670 const auto StringAnnotStr = static_cast <std::string>(AnnotStr);
@@ -3746,8 +3676,12 @@ void SPIRVToLLVM::transIntelFPGADecorations(SPIRVValue *BV, Value *V) {
37463676 AnnotationsMap.emplace (std::move (StringAnnotStr), GS);
37473677 }
37483678
3749- Value *BaseInst =
3750- AL ? Builder.CreateBitCast (V, Int8PtrTyPrivate, V->getName ()) : Inst;
3679+ Value *BaseInst = nullptr ;
3680+ if (AnnotationCall && !AnnotationCall->getType ()->isVoidTy ())
3681+ BaseInst = AnnotationCall;
3682+ else
3683+ BaseInst = AL ? Builder.CreateBitCast (V, Int8PtrTyPrivate, V->getName ())
3684+ : Inst;
37513685
37523686 // Try to find alloca instruction for statically allocated variables.
37533687 // Alloca might be hidden by a couple of casts.
@@ -3766,8 +3700,10 @@ void SPIRVToLLVM::transIntelFPGADecorations(SPIRVValue *BV, Value *V) {
37663700 llvm::Value *Args[] = {BaseInst,
37673701 Builder.CreateBitCast (GS, Int8PtrTyPrivate),
37683702 UndefInt8Ptr, UndefInt32, UndefInt8Ptr};
3769- Builder.CreateCall (AnnotationFn, Args);
3703+ AnnotationCall = Builder.CreateCall (AnnotationFn, Args);
37703704 }
3705+ if (AnnotationCall && !AnnotationCall->getType ()->isVoidTy ())
3706+ ValueMap[BV] = AnnotationCall;
37713707 } else if (auto *GV = dyn_cast<GlobalVariable>(V)) {
37723708 std::vector<SmallString<256 >> AnnotStrVec;
37733709 generateIntelFPGAAnnotation (BV, AnnotStrVec);
0 commit comments