Skip to content

Commit a84bfca

Browse files
haonanya1svenvh
haonanya1
and
svenvh
authored
Set spirv.Source according to the opencl.ocl.version and opencl.cxx.version. (#2631)
Align with llvm/llvm-project@5fd5b8a. Co-authored-by: Sven van Haastregt <[email protected]>
1 parent 19b7768 commit a84bfca

File tree

7 files changed

+94
-20
lines changed

7 files changed

+94
-20
lines changed

‎lib/SPIRV/OCLUtil.cpp‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -789,26 +789,39 @@ decodeOCLVer(unsigned Ver) {
789789
}
790790

791791
unsigned getOCLVersion(Module *M, bool AllowMulti) {
792-
NamedMDNode *NamedMD = M->getNamedMetadata(kSPIR2MD::OCLVer);
793-
if (!NamedMD)
792+
NamedMDNode *NamedMDOCLVer = M->getNamedMetadata(kSPIR2MD::OCLVer);
793+
NamedMDNode *NamedMDOCLCXXVer = M->getNamedMetadata(kSPIR2MD::OCLCXXVer);
794+
if (!NamedMDOCLVer && !NamedMDOCLCXXVer)
794795
return 0;
795-
assert(NamedMD->getNumOperands() > 0 && "Invalid SPIR");
796-
if (!AllowMulti && NamedMD->getNumOperands() != 1)
797-
report_fatal_error(
798-
llvm::Twine("Multiple OCL version metadata not allowed"));
799796

800797
// If the module was linked with another module, there may be multiple
801798
// operands.
802-
auto GetVer = [=](unsigned I) {
799+
auto GetVerPair = [](unsigned I, NamedMDNode *NamedMD) {
803800
auto *MD = NamedMD->getOperand(I);
804801
return std::make_pair(getMDOperandAsInt(MD, 0), getMDOperandAsInt(MD, 1));
805802
};
806-
auto Ver = GetVer(0);
807-
for (unsigned I = 1, E = NamedMD->getNumOperands(); I != E; ++I)
808-
if (Ver != GetVer(I))
809-
report_fatal_error(llvm::Twine("OCL version mismatch"));
810-
811-
return encodeOCLVer(Ver.first, Ver.second, 0);
803+
auto GetVer = [=](NamedMDNode *NamedMD) {
804+
assert(NamedMD->getNumOperands() && "Invalid SPIR");
805+
if (!AllowMulti && NamedMD->getNumOperands() != 1)
806+
report_fatal_error(
807+
llvm::Twine("Multiple OCL version metadata not allowed"));
808+
auto Ver = GetVerPair(0, NamedMD);
809+
for (unsigned I = 1, E = NamedMD->getNumOperands(); I != E; ++I)
810+
if (Ver != GetVerPair(I, NamedMD))
811+
report_fatal_error(llvm::Twine("OCL version mismatch"));
812+
return encodeOCLVer(Ver.first, Ver.second, 0);
813+
};
814+
unsigned OCLVer = NamedMDOCLVer ? GetVer(NamedMDOCLVer) : 0;
815+
unsigned OCLCXXVer = NamedMDOCLCXXVer ? GetVer(NamedMDOCLCXXVer) : 0;
816+
// Check if OCLCXXVer is compatible with OCLVer
817+
if (OCLVer && OCLCXXVer) {
818+
if ((OCLVer == kOCLVer::CL20 && OCLCXXVer == kOCLVer::CLCXX10) ||
819+
(OCLVer == kOCLVer::CL30 && OCLCXXVer == kOCLVer::CLCXX2021))
820+
return OCLCXXVer;
821+
report_fatal_error(llvm::Twine(
822+
"opencl cxx version is not compatible with opencl c version!"));
823+
}
824+
return OCLVer;
812825
}
813826

814827
SmallVector<unsigned, 3> decodeMDNode(MDNode *N) {

‎lib/SPIRV/OCLUtil.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,9 @@ const OCLScopeKind OCLLegacyAtomicMemScope = OCLMS_work_group;
351351
namespace kOCLVer {
352352
const unsigned CL12 = 102000;
353353
const unsigned CL20 = 200000;
354-
const unsigned CL21 = 201000;
355354
const unsigned CL30 = 300000;
355+
const unsigned CLCXX10 = 100000;
356+
const unsigned CLCXX2021 = 202100000;
356357
} // namespace kOCLVer
357358

358359
namespace OclExt {

‎lib/SPIRV/PreprocessMetadata.cpp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,12 +295,16 @@ void PreprocessMetadataBase::preprocessOCLMetadata(Module *M, SPIRVMDBuilder *B,
295295
// !{x} = !{i32 3, i32 102000}
296296
B->addNamedMD(kSPIRVMD::Source)
297297
.addOp()
298-
.add(CLVer == kOCLVer::CL21 ? spv::SourceLanguageOpenCL_CPP
299-
: spv::SourceLanguageOpenCL_C)
298+
.add(M->getNamedMetadata(kSPIR2MD::OCLCXXVer) &&
299+
(CLVer == kOCLVer::CLCXX10 || CLVer == kOCLVer::CLCXX2021)
300+
? spv::SourceLanguageCPP_for_OpenCL
301+
: spv::SourceLanguageOpenCL_C)
300302
.add(CLVer)
301303
.done();
302304
if (EraseOCLMD)
303-
B->eraseNamedMD(kSPIR2MD::OCLVer).eraseNamedMD(kSPIR2MD::SPIRVer);
305+
B->eraseNamedMD(kSPIR2MD::OCLVer)
306+
.eraseNamedMD(kSPIR2MD::SPIRVer)
307+
.eraseNamedMD(kSPIR2MD::OCLCXXVer);
304308

305309
// !spirv.MemoryModel = !{!x}
306310
// !{x} = !{i32 1, i32 2}

‎lib/SPIRV/SPIRVInternal.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ namespace kSPIR2MD {
403403
const static char Extensions[] = "opencl.used.extensions";
404404
const static char FPContract[] = "opencl.enable.FP_CONTRACT";
405405
const static char OCLVer[] = "opencl.ocl.version";
406+
const static char OCLCXXVer[] = "opencl.cxx.version";
406407
const static char OptFeatures[] = "opencl.used.optional.core.features";
407408
const static char SPIRVer[] = "opencl.spir.version";
408409
const static char VecTyHint[] = "vec_type_hint";

‎lib/SPIRV/SPIRVReader.cpp‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3498,7 +3498,8 @@ bool SPIRVToLLVM::translate() {
34983498
if (BM->getDesiredBIsRepresentation() == BIsRepresentation::SPIRVFriendlyIR) {
34993499
SPIRVWord SrcLangVer = 0;
35003500
BM->getSourceLanguage(&SrcLangVer);
3501-
bool IsCpp = SrcLangVer == kOCLVer::CL21;
3501+
bool IsCpp =
3502+
SrcLangVer == kOCLVer::CLCXX10 || SrcLangVer == kOCLVer::CLCXX2021;
35023503
if (!postProcessBuiltinsReturningStruct(M, IsCpp))
35033504
return false;
35043505
}
@@ -4831,7 +4832,7 @@ void SPIRVToLLVM::transSourceLanguage() {
48314832
SPIRVWord Ver = 0;
48324833
SourceLanguage Lang = BM->getSourceLanguage(&Ver);
48334834
if (Lang != SourceLanguageUnknown && // Allow unknown for debug info test
4834-
Lang != SourceLanguageOpenCL_C && Lang != SourceLanguageOpenCL_CPP)
4835+
Lang != SourceLanguageOpenCL_C && Lang != SourceLanguageCPP_for_OpenCL)
48354836
return;
48364837
unsigned short Major = 0;
48374838
unsigned char Minor = 0;
@@ -4845,7 +4846,15 @@ void SPIRVToLLVM::transSourceLanguage() {
48454846
else
48464847
addOCLVersionMetadata(Context, M, kSPIR2MD::SPIRVer, 2, 0);
48474848

4848-
addOCLVersionMetadata(Context, M, kSPIR2MD::OCLVer, Major, Minor);
4849+
if (Lang == SourceLanguageOpenCL_C) {
4850+
addOCLVersionMetadata(Context, M, kSPIR2MD::OCLVer, Major, Minor);
4851+
return;
4852+
}
4853+
if (Lang == SourceLanguageCPP_for_OpenCL) {
4854+
addOCLVersionMetadata(Context, M, kSPIR2MD::OCLCXXVer, Major, Minor);
4855+
addOCLVersionMetadata(Context, M, kSPIR2MD::OCLVer,
4856+
Ver == kOCLVer::CLCXX10 ? 2 : 3, 0);
4857+
}
48494858
}
48504859

48514860
bool SPIRVToLLVM::transSourceExtension() {

‎test/transcoding/spirvSourceCL2.0.ll‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
; RUN: llvm-as < %s > %t.bc
2+
; RUN: llvm-spirv %t.bc -o %t.spv
3+
; RUN: llvm-spirv -to-text %t.spv -o %t.spt
4+
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
5+
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
6+
; RUN: llvm-dis %t.rev.bc -o - | FileCheck %s --check-prefixes=CHECK-LLVM
7+
8+
; CHECK-SPIRV: Source 3 200000
9+
; CHECK-LLVM-NOT: opencl.cxx.version
10+
; CHECK-LLVM: !spirv.Source = !{[[SPVSource:![0-9]+]]}
11+
; CHECK-LLVM: !opencl.ocl.version = !{[[OCLVer:![0-9]+]]}
12+
; CHECK-LLVM: [[SPVSource]] = !{i32 3, i32 200000}
13+
; CHECK-LLVM: [[OCLVer]] = !{i32 2, i32 0}
14+
15+
16+
target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
17+
target triple = "spir64-unknown-unknown"
18+
19+
!opencl.ocl.version = !{!0}
20+
!opencl.spir.version = !{!0}
21+
22+
!0 = !{i32 2, i32 0}

‎test/transcoding/spirvSourceCLCXX.ll‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
; RUN: llvm-as < %s > %t.bc
2+
; RUN: llvm-spirv %t.bc -o %t.spv
3+
; RUN: llvm-spirv -to-text %t.spv -o %t.spt
4+
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
5+
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
6+
; RUN: llvm-dis %t.rev.bc -o - | FileCheck %s --check-prefixes=CHECK-LLVM
7+
8+
; CHECK-SPIRV: Source 6 100000
9+
; CHECK-LLVM: !spirv.Source = !{[[SPVSource:![0-9]+]]}
10+
; CHECK-LLVM: !opencl.cxx.version = !{[[OCLCXXVer:![0-9]+]]}
11+
; CHECK-LLVM: !opencl.ocl.version = !{[[OCLVer:![0-9]+]]}
12+
; CHECK-LLVM: [[SPVSource]] = !{i32 6, i32 100000}
13+
; CHECK-LLVM: [[OCLCXXVer]] = !{i32 1, i32 0}
14+
; CHECK-LLVM: [[OCLVer]] = !{i32 2, i32 0}
15+
16+
target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
17+
target triple = "spir64-unknown-unknown"
18+
19+
!opencl.ocl.version = !{!1}
20+
!opencl.cxx.version = !{!2}
21+
!opencl.spir.version = !{!1}
22+
23+
!1 = !{i32 2, i32 0}
24+
!2 = !{i32 1, i32 0}

0 commit comments

Comments
 (0)