Skip to content

Commit 12556fb

Browse files
authored
Update after llvm::Triple changes (#3046)
Update after llvm-project commit `979c275097a6 ("[IR] Store Triple in Module (NFC) (#129868)", 2025-03-06)`.
1 parent f3e8eac commit 12556fb

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

lib/SPIRV/SPIRVReader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3925,11 +3925,11 @@ bool SPIRVToLLVM::translate() {
39253925
bool SPIRVToLLVM::transAddressingModel() {
39263926
switch (BM->getAddressingModel()) {
39273927
case AddressingModelPhysical64:
3928-
M->setTargetTriple(SPIR_TARGETTRIPLE64);
3928+
M->setTargetTriple(Triple(SPIR_TARGETTRIPLE64));
39293929
M->setDataLayout(SPIR_DATALAYOUT64);
39303930
break;
39313931
case AddressingModelPhysical32:
3932-
M->setTargetTriple(SPIR_TARGETTRIPLE32);
3932+
M->setTargetTriple(Triple(SPIR_TARGETTRIPLE32));
39333933
M->setDataLayout(SPIR_DATALAYOUT32);
39343934
break;
39353935
case AddressingModelLogical:

lib/SPIRV/SPIRVWriter.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5489,7 +5489,7 @@ SPIRVValue *LLVMToSPIRVBase::transAsmINTEL(InlineAsm *IA) {
54895489
// TODO: intention here is to provide information about actual target
54905490
// but in fact spir-64 is substituted as triple when translator works
54915491
// eventually we need to fix it (not urgent)
5492-
StringRef TripleStr(M->getTargetTriple());
5492+
StringRef TripleStr(M->getTargetTriple().str());
54935493
auto *AsmTarget = static_cast<SPIRVAsmTargetINTEL *>(
54945494
BM->getOrAddAsmTargetINTEL(TripleStr.str()));
54955495
auto *SIA = BM->addAsmINTEL(
@@ -7000,7 +7000,8 @@ bool isValidLLVMModule(Module *M, SPIRVErrorLog &ErrorLog) {
70007000

70017001
Triple TT(M->getTargetTriple());
70027002
if (!ErrorLog.checkError(isSupportedTriple(TT), SPIRVEC_InvalidTargetTriple,
7003-
"Actual target triple is " + M->getTargetTriple()))
7003+
"Actual target triple is " +
7004+
M->getTargetTriple().str()))
70047005
return false;
70057006

70067007
return true;
@@ -7101,7 +7102,7 @@ bool runSpirvBackend(Module *M, std::string &Result, std::string &ErrMsg,
71017102
? Triple::spirv64
71027103
: Triple::spirv32,
71037104
TargetTriple.getSubArch());
7104-
M->setTargetTriple(TargetTriple.str());
7105+
M->setTargetTriple(TargetTriple);
71057106
// We need to reset Data Layout to conform with the TargetMachine
71067107
M->setDataLayout("");
71077108
}
@@ -7110,7 +7111,7 @@ bool runSpirvBackend(Module *M, std::string &Result, std::string &ErrMsg,
71107111
TargetTriple.setTriple(DefaultTriple);
71117112
TargetTriple.setArch(TargetTriple.getArch(),
71127113
spirvVersionToSubArch(TranslatorOpts.getMaxVersion()));
7113-
M->setTargetTriple(TargetTriple.str());
7114+
M->setTargetTriple(TargetTriple);
71147115
}
71157116

71167117
// Translate the Module into SPIR-V

0 commit comments

Comments
 (0)