Skip to content

Commit b2a0eda

Browse files
CatherineMooreCatherineMoore
authored
Merge branch 'release/rocm-rel-6.4' into amd/dev/catmoore/openmp-generic-target
2 parents 43b9c54 + aa0c041 commit b2a0eda

28 files changed

+398
-195
lines changed

‎amd/comgr/src/comgr-spirv-command.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ amd_comgr_status_t SPIRVCommand::execute(raw_ostream &LogS) {
7676
Module *M;
7777
std::string Err;
7878

79-
if (!readSpirv(Context, ISS, M, Err)) {
79+
SPIRV::TranslatorOpts Opts;
80+
Opts.enableAllExtensions();
81+
Opts.setDesiredBIsRepresentation(SPIRV::BIsRepresentation::OpenCL20);
82+
83+
if (!readSpirv(Context, Opts, ISS, M, Err)) {
8084
LogS << "Failed to load SPIR-V as LLVM Module: " << Err << '\n';
8185
return AMD_COMGR_STATUS_ERROR;
8286
}

‎amd/comgr/test/unbundle_hip_test.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@
4949
//
5050
// // Manually unbundle bitcode bundle
5151
// clang-offload-bundler -type=bc \
52-
// -targets=hip-amdgcn-amd-amdhsa-gfx900 \
52+
// -targets=hip-amdgcn-amd-amdhsa-unknown-gfx900 \
5353
// -input=square.bc -output=square-gfx900.bc \
5454
// -unbundle -allow-missing-bundles
5555
//
5656
// // Manually unbundle object file bundle
5757
// clang-offload-bundler -type=o \
58-
// -targets=hip-amdgcn-amd-amdhsa-gfx900 \
58+
// -targets=hip-amdgcn-amd-amdhsa-unknown-gfx900 \
5959
// -input=double.o -output=double-gfx900.o \
6060
// -unbundle -allow-missing-bundles
6161
//
6262
// // Manually unbundle archive bundle
6363
// clang-offload-bundler -type=a \
64-
// -targets=hip-amdgcn-amd-amdhsa-gfx900 \
64+
// -targets=hip-amdgcn-amd-amdhsa-unknown-gfx900 \
6565
// -input=cube.a -output=cube-gfx900.a \
6666
// -unbundle -allow-missing-bundles \
6767
// -hip-openmp-compatible
@@ -131,7 +131,7 @@ int main(int Argc, char *Argv[]) {
131131
checkError(Status, "amd_comgr_action_info_set_language");
132132

133133
const char *BundleEntryIDs[] = {"host-x86_64-unknown-linux-gnu",
134-
"hip-amdgcn-amd-amdhsa-gfx900"};
134+
"hip-amdgcn-amd-amdhsa-unknown-gfx900"};
135135
size_t BundleEntryIDsCount =
136136
sizeof(BundleEntryIDs) / sizeof(BundleEntryIDs[0]);
137137
Status = amd_comgr_action_info_set_bundle_entry_ids(ActionInfoUnbundle,
@@ -182,8 +182,8 @@ int main(int Argc, char *Argv[]) {
182182
Status = amd_comgr_release_data(DataElement);
183183
checkError(Status, "amd_comgr_release_data");
184184

185-
if (BytesSize != 0) {
186-
printf("Bitcode host element size: %ld (expected 0)\n", BytesSize);
185+
if (!BytesSize) {
186+
printf("Bitcode host empty (expected non-empty)\n");
187187
exit(1);
188188
}
189189

@@ -197,7 +197,7 @@ int main(int Argc, char *Argv[]) {
197197
Status = amd_comgr_get_data_name(DataElement, &NameSize, &Name[0]);
198198
checkError(Status, "amd_comgr_get_data_name");
199199

200-
ExpectedName = "square-hip-amdgcn-amd-amdhsa-gfx900.bc";
200+
ExpectedName = "square-hip-amdgcn-amd-amdhsa-unknown-gfx900.bc";
201201
if (strcmp(Name, ExpectedName)) {
202202
printf("Bitcode hip-gfx900 element name mismatch: %s (expected %s)\n",
203203
Name, ExpectedName);
@@ -248,8 +248,8 @@ int main(int Argc, char *Argv[]) {
248248
checkError(Status, "amd_comgr_release_data");
249249

250250
if (BytesSize != 0) {
251-
printf("Object host element size: %ld (expected empty)\n", BytesSize);
252-
exit(1);
251+
printf("Object host element size: %ld (expected empty)\n", BytesSize);
252+
exit(1);
253253
}
254254

255255
// object hip-gfx900 element (non-empty)
@@ -262,7 +262,7 @@ int main(int Argc, char *Argv[]) {
262262
Status = amd_comgr_get_data_name(DataElement, &NameSize, &Name[0]);
263263
checkError(Status, "amd_comgr_get_data_name");
264264

265-
ExpectedName = "double-hip-amdgcn-amd-amdhsa-gfx900.o";
265+
ExpectedName = "double-hip-amdgcn-amd-amdhsa-unknown-gfx900.o";
266266
if (strcmp(Name, ExpectedName)) {
267267
printf("Object hip-gfx900 element name mismatch: %s (expected %s)\n",
268268
Name, ExpectedName);
@@ -312,8 +312,8 @@ int main(int Argc, char *Argv[]) {
312312
Status = amd_comgr_release_data(DataElement);
313313
checkError(Status, "amd_comgr_release_data");
314314

315-
if (BytesSize != 8) {
316-
printf("Arvhive host element size: %ld (expected 8)\n", BytesSize);
315+
if (!BytesSize) {
316+
printf("Arvhive host empty (expected non-empty)\n");
317317
exit(1);
318318
}
319319

@@ -327,7 +327,7 @@ int main(int Argc, char *Argv[]) {
327327
Status = amd_comgr_get_data_name(DataElement, &NameSize, &Name[0]);
328328
checkError(Status, "amd_comgr_get_data_name");
329329

330-
ExpectedName = "cube-hip-amdgcn-amd-amdhsa-gfx900.a";
330+
ExpectedName = "cube-hip-amdgcn-amd-amdhsa-unknown-gfx900.a";
331331
if (strcmp(Name, ExpectedName)) {
332332
printf("Archive hip-gfx900 bundle name mismatch: %s (expected %s)\n",
333333
Name, ExpectedName);

‎clang/docs/ClangOffloadBundler.rst‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,14 @@ without differentiation based on offload kind.
266266
The target triple of the code object. See `Target Triple
267267
<https://clang.llvm.org/docs/CrossCompilation.html#target-triple>`_.
268268

269-
The bundler accepts target triples with or without the optional environment
270-
field:
269+
LLVM target triples can be with or without the optional environment field:
271270

272271
``<arch><sub>-<vendor>-<sys>``, or
273272
``<arch><sub>-<vendor>-<sys>-<env>``
274273

275-
However, in order to standardize outputs for tools that consume bitcode
276-
bundles, bundles written by the bundler internally use only the 4-field
277-
target triple:
274+
However, in order to standardize outputs for tools that consume bitcode bundles
275+
and to parse target ID containing dashes, the bundler only accepts target
276+
triples in the 4-field format:
278277

279278
``<arch><sub>-<vendor>-<sys>-<env>``
280279

‎clang/include/clang/Driver/OffloadBundler.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ class CompressedOffloadBundle {
131131
decompress(const llvm::MemoryBuffer &Input, bool Verbose = false);
132132
};
133133

134+
/// Check whether the bundle id is in the following format:
135+
/// <kind>-<triple>[-<target id>[:target features]]
136+
/// <triple> := <arch>-<vendor>-<os>-<env>
137+
bool checkOffloadBundleID(const llvm::StringRef Str);
134138
} // namespace clang
135139

136140
#endif // LLVM_CLANG_DRIVER_OFFLOADBUNDLER_H

‎clang/lib/Driver/OffloadBundler.cpp‎

Lines changed: 52 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -75,32 +75,27 @@ OffloadTargetInfo::OffloadTargetInfo(const StringRef Target,
7575
const OffloadBundlerConfig &BC)
7676
: BundlerConfig(BC) {
7777

78-
// TODO: Add error checking from ClangOffloadBundler.cpp
79-
auto TargetFeatures = Target.split(':');
80-
auto TripleOrGPU = TargetFeatures.first.rsplit('-');
81-
82-
if (clang::StringToOffloadArch(TripleOrGPU.second) !=
83-
clang::OffloadArch::UNKNOWN) {
84-
auto KindTriple = TripleOrGPU.first.split('-');
85-
this->OffloadKind = KindTriple.first;
86-
87-
// Enforce optional env field to standardize bundles
88-
llvm::Triple t = llvm::Triple(KindTriple.second);
89-
this->Triple = llvm::Triple(t.getArchName(), t.getVendorName(),
90-
t.getOSName(), t.getEnvironmentName());
91-
92-
this->TargetID = Target.substr(Target.find(TripleOrGPU.second));
93-
} else {
94-
auto KindTriple = TargetFeatures.first.split('-');
95-
this->OffloadKind = KindTriple.first;
96-
97-
// Enforce optional env field to standardize bundles
98-
llvm::Triple t = llvm::Triple(KindTriple.second);
99-
this->Triple = llvm::Triple(t.getArchName(), t.getVendorName(),
100-
t.getOSName(), t.getEnvironmentName());
101-
78+
// <kind>-<triple>[-<target id>[:target features]]
79+
// <triple> := <arch>-<vendor>-<os>-<env>
80+
SmallVector<StringRef, 6> Components;
81+
Target.split(Components, '-', /*MaxSplit=*/5);
82+
assert((Components.size() == 5 || Components.size() == 6) &&
83+
"malformed target string");
84+
85+
StringRef TargetIdWithFeature =
86+
Components.size() == 6 ? Components.back() : "";
87+
StringRef TargetId = TargetIdWithFeature.split(':').first;
88+
if (!TargetId.empty() &&
89+
clang::StringToOffloadArch(TargetId) != clang::OffloadArch::UNKNOWN)
90+
this->TargetID = TargetIdWithFeature;
91+
else
10292
this->TargetID = "";
103-
}
93+
94+
this->OffloadKind = Components.front();
95+
ArrayRef<StringRef> TripleSlice{&Components[1], /*length=*/4};
96+
llvm::Triple T = llvm::Triple(llvm::join(TripleSlice, "-"));
97+
this->Triple = llvm::Triple(T.getArchName(), T.getVendorName(), T.getOSName(),
98+
T.getEnvironmentName());
10499
}
105100

106101
bool OffloadTargetInfo::hasHostKind() const {
@@ -140,7 +135,18 @@ bool OffloadTargetInfo::operator==(const OffloadTargetInfo &Target) const {
140135
}
141136

142137
std::string OffloadTargetInfo::str() const {
143-
return Twine(OffloadKind + "-" + Triple.str() + "-" + TargetID).str();
138+
std::string NormalizedTriple;
139+
// Unfortunately we need some special sauce for AMDGPU because all the runtime
140+
// assumes the triple to be "amdgcn-amd-amdhsa-" (empty environment) instead
141+
// of "amdgcn-amd-amdhsa-unknown". It's gonna be very tricky to patch
142+
// different layers of runtime.
143+
if (Triple.isAMDGPU()) {
144+
NormalizedTriple = Triple.normalize(Triple::CanonicalForm::THREE_IDENT);
145+
NormalizedTriple.push_back('-');
146+
} else {
147+
NormalizedTriple = Triple.normalize(Triple::CanonicalForm::FOUR_IDENT);
148+
}
149+
return Twine(OffloadKind + "-" + NormalizedTriple + "-" + TargetID).str();
144150
}
145151

146152
static StringRef getDeviceFileExtension(StringRef Device,
@@ -1424,6 +1430,9 @@ Error OffloadBundler::UnbundleFiles() {
14241430
StringMap<StringRef> Worklist;
14251431
auto Output = BundlerConfig.OutputFileNames.begin();
14261432
for (auto &Triple : BundlerConfig.TargetNames) {
1433+
if (!checkOffloadBundleID(Triple))
1434+
return createStringError(errc::invalid_argument,
1435+
"invalid bundle id from bundle config");
14271436
Worklist[Triple] = *Output;
14281437
++Output;
14291438
}
@@ -1443,6 +1452,9 @@ Error OffloadBundler::UnbundleFiles() {
14431452

14441453
StringRef CurTriple = **CurTripleOrErr;
14451454
assert(!CurTriple.empty());
1455+
if (!checkOffloadBundleID(CurTriple))
1456+
return createStringError(errc::invalid_argument,
1457+
"invalid bundle id read from the bundle");
14461458

14471459
auto Output = Worklist.begin();
14481460
for (auto E = Worklist.end(); Output != E; Output++) {
@@ -1501,6 +1513,8 @@ Error OffloadBundler::UnbundleFiles() {
15011513
return createFileError(E.second, EC);
15021514

15031515
// If this entry has a host kind, copy the input file to the output file.
1516+
// We don't need to check E.getKey() here through checkOffloadBundleID
1517+
// because the entire WorkList has been checked above.
15041518
auto OffloadInfo = OffloadTargetInfo(E.getKey(), BundlerConfig);
15051519
if (OffloadInfo.hasHostKind())
15061520
OutputFile.write(Input.getBufferStart(), Input.getBufferSize());
@@ -1730,6 +1744,10 @@ Error OffloadBundler::UnbundleArchive() {
17301744
// archive.
17311745
while (!CodeObject.empty()) {
17321746
SmallVector<StringRef> CompatibleTargets;
1747+
if (!checkOffloadBundleID(CodeObject)) {
1748+
return createStringError(errc::invalid_argument,
1749+
"Invalid bundle id read from code object");
1750+
}
17331751
auto CodeObjectInfo = OffloadTargetInfo(CodeObject, BundlerConfig);
17341752
if (getCompatibleOffloadTargets(CodeObjectInfo, CompatibleTargets,
17351753
BundlerConfig)) {
@@ -1819,3 +1837,11 @@ Error OffloadBundler::UnbundleArchive() {
18191837

18201838
return Error::success();
18211839
}
1840+
1841+
bool clang::checkOffloadBundleID(const llvm::StringRef Str) {
1842+
// <kind>-<triple>[-<target id>[:target features]]
1843+
// <triple> := <arch>-<vendor>-<os>-<env>
1844+
SmallVector<StringRef, 6> Components;
1845+
Str.split(Components, '-', /*MaxSplit=*/5);
1846+
return Components.size() == 5 || Components.size() == 6;
1847+
}

‎clang/lib/Driver/ToolChains/Clang.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8967,7 +8967,8 @@ void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA,
89678967
}
89688968
Triples += Action::GetOffloadKindName(CurKind);
89698969
Triples += '-';
8970-
Triples += CurTC->getTriple().normalize();
8970+
Triples +=
8971+
CurTC->getTriple().normalize(llvm::Triple::CanonicalForm::FOUR_IDENT);
89718972
if ((CurKind == Action::OFK_HIP || CurKind == Action::OFK_Cuda) &&
89728973
!StringRef(CurDep->getOffloadingArch()).empty()) {
89738974
Triples += '-';
@@ -9070,7 +9071,8 @@ void OffloadBundler::ConstructJobMultipleOutputs(
90709071
auto OffloadKind = Dep.DependentOffloadKind;
90719072
Triples += Action::GetOffloadKindName(OffloadKind);
90729073
Triples += '-';
9073-
Triples += Dep.DependentToolChain->getTriple().normalize();
9074+
Triples += Dep.DependentToolChain->getTriple().normalize(
9075+
llvm::Triple::CanonicalForm::FOUR_IDENT);
90749076
if ((Dep.DependentOffloadKind == Action::OFK_HIP ||
90759077
Dep.DependentOffloadKind == Action::OFK_Cuda) &&
90769078
!Dep.DependentBoundArch.empty()) {

‎clang/lib/Driver/ToolChains/CommonArgs.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2660,7 +2660,8 @@ static void GetSDLFromOffloadArchive(
26602660
SmallString<128> DeviceTriple;
26612661
DeviceTriple += Action::GetOffloadKindName(JA.getOffloadingDeviceKind());
26622662
DeviceTriple += '-';
2663-
std::string NormalizedTriple = T.getToolChain().getTriple().normalize();
2663+
std::string NormalizedTriple = T.getToolChain().getTriple().normalize(
2664+
llvm::Triple::CanonicalForm::FOUR_IDENT);
26642665
DeviceTriple += NormalizedTriple;
26652666
if (!Target.empty()) {
26662667
DeviceTriple += '-';

‎clang/lib/Driver/ToolChains/HIPUtility.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static std::string normalizeForBundler(const llvm::Triple &T,
4545
return HasTargetID ? (T.getArchName() + "-" + T.getVendorName() + "-" +
4646
T.getOSName() + "-" + T.getEnvironmentName())
4747
.str()
48-
: T.normalize();
48+
: T.normalize(llvm::Triple::CanonicalForm::FOUR_IDENT);
4949
}
5050

5151
// Collect undefined __hip_fatbin* and __hip_gpubin_handle* symbols from all
@@ -292,7 +292,7 @@ void HIP::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
292292

293293
// ToDo: Remove the dummy host binary entry which is required by
294294
// clang-offload-bundler.
295-
std::string BundlerTargetArg = "-targets=host-x86_64-unknown-linux";
295+
std::string BundlerTargetArg = "-targets=host-x86_64-unknown-linux-gnu";
296296
// AMDGCN:
297297
// For code object version 2 and 3, the offload kind in bundle ID is 'hip'
298298
// for backward compatibility. For code object version 4 and greater, the

‎clang/test/Driver/clang-offload-bundler-asserts-on.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
// Check code object compatibility for archive unbundling
1616
//
1717
// Create few code object bundles and archive them to create an input archive
18-
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,openmp-amdgcn-amd-amdhsa-gfx906,openmp-amdgcn-amd-amdhsa--gfx908 -input=%t.o -input=%t.tgt1 -input=%t.tgt2 -output=%t.simple.bundle
18+
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,openmp-amdgcn-amd-amdhsa--gfx906,openmp-amdgcn-amd-amdhsa--gfx908 -input=%t.o -input=%t.tgt1 -input=%t.tgt2 -output=%t.simple.bundle
1919
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,openmp-amdgcn-amd-amdhsa--gfx906:sramecc+:xnack+,openmp-amdgcn-amd-amdhsa--gfx908:sramecc+:xnack+ -inputs=%t.o,%t.tgt1,%t.tgt1 -outputs=%t.targetID1.bundle
2020
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,openmp-amdgcn-amd-amdhsa--gfx906:sramecc+:xnack-,openmp-amdgcn-amd-amdhsa--gfx908:sramecc+:xnack- -inputs=%t.o,%t.tgt1,%t.tgt1 -outputs=%t.targetID2.bundle
2121
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,openmp-amdgcn-amd-amdhsa--gfx906:xnack-,openmp-amdgcn-amd-amdhsa--gfx908:xnack- -inputs=%t.o,%t.tgt1,%t.tgt1 -outputs=%t.targetID3.bundle
2222
// RUN: llvm-ar cr %t.input-archive.a %t.simple.bundle %t.targetID1.bundle %t.targetID2.bundle %t.targetID3.bundle
2323

2424
// Tests to check compatibility between Bundle Entry ID formats i.e. between presence/absence of extra hyphen in case of missing environment field
25-
// RUN: clang-offload-bundler -unbundle -type=a -targets=openmp-amdgcn-amd-amdhsa--gfx906,openmp-amdgcn-amd-amdhsa-gfx908 -input=%t.input-archive.a -output=%t-archive-gfx906-simple.a -output=%t-archive-gfx908-simple.a -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=BUNDLECOMPATIBILITY
25+
// RUN: clang-offload-bundler -unbundle -type=a -targets=openmp-amdgcn-amd-amdhsa--gfx906,openmp-amdgcn-amd-amdhsa--gfx908 -input=%t.input-archive.a -output=%t-archive-gfx906-simple.a -output=%t-archive-gfx908-simple.a -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=BUNDLECOMPATIBILITY
2626
// BUNDLECOMPATIBILITY: Compatible: Exact match: [CodeObject: openmp-amdgcn-amd-amdhsa--gfx906] : [Target: openmp-amdgcn-amd-amdhsa--gfx906]
2727
// BUNDLECOMPATIBILITY: Compatible: Exact match: [CodeObject: openmp-amdgcn-amd-amdhsa--gfx908] : [Target: openmp-amdgcn-amd-amdhsa--gfx908]
2828

29-
// RUN: clang-offload-bundler -unbundle -type=a -targets=hip-amdgcn-amd-amdhsa--gfx906,hipv4-amdgcn-amd-amdhsa-gfx908 -input=%t.input-archive.a -output=%t-hip-archive-gfx906-simple.a -output=%t-hipv4-archive-gfx908-simple.a -hip-openmp-compatible -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=HIPOpenMPCOMPATIBILITY
29+
// RUN: clang-offload-bundler -unbundle -type=a -targets=hip-amdgcn-amd-amdhsa--gfx906,hipv4-amdgcn-amd-amdhsa--gfx908 -input=%t.input-archive.a -output=%t-hip-archive-gfx906-simple.a -output=%t-hipv4-archive-gfx908-simple.a -hip-openmp-compatible -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=HIPOpenMPCOMPATIBILITY
3030
// HIPOpenMPCOMPATIBILITY: Compatible: Target IDs are compatible [CodeObject: openmp-amdgcn-amd-amdhsa--gfx906] : [Target: hip-amdgcn-amd-amdhsa--gfx906]
3131
// HIPOpenMPCOMPATIBILITY: Compatible: Target IDs are compatible [CodeObject: openmp-amdgcn-amd-amdhsa--gfx908] : [Target: hipv4-amdgcn-amd-amdhsa--gfx908]
3232

‎clang/test/Driver/clang-offload-bundler-standardize.c‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,12 @@
1515
//
1616
// Check code object compatibility for archive unbundling
1717
//
18-
// Create an object bundle with and without env fields
19-
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,hip-amdgcn-amd-amdhsa-gfx906,hip-amdgcn-amd-amdhsa-gfx908 -input=%t.o -input=%t.tgt1 -input=%t.tgt2 -output=%t.bundle.no.env
20-
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple-,hip-amdgcn-amd-amdhsa--gfx906,hip-amdgcn-amd-amdhsa--gfx908 -input=%t.o -input=%t.tgt1 -input=%t.tgt2 -output=%t.bundle.env
18+
// Create an object bundle
19+
// RUN: clang-offload-bundler -type=o -targets=host-%itanium_abi_triple,hip-amdgcn-amd-amdhsa--gfx906,hip-amdgcn-amd-amdhsa--gfx908 -input=%t.o -input=%t.tgt1 -input=%t.tgt2 -output=%t.bundle
2120

22-
23-
// Unbundle bundle.no.env while providing targets with env
24-
// RUN: clang-offload-bundler -unbundle -type=o -targets=hip-amdgcn-amd-amdhsa--gfx906,hip-amdgcn-amd-amdhsa--gfx908 -input=%t.bundle.no.env -output=%t-hip-amdgcn-amd-amdhsa--gfx906.bc -output=%t-hip-amdgcn-amd-amdhsa--gfx908.bc -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=BUNDLE-NO-ENV
25-
// BUNDLE-NO-ENV: Compatible: Exact match: [CodeObject: hip-amdgcn-amd-amdhsa--gfx906] : [Target: hip-amdgcn-amd-amdhsa--gfx906]
26-
// BUNDLE-NO-ENV: Compatible: Exact match: [CodeObject: hip-amdgcn-amd-amdhsa--gfx908] : [Target: hip-amdgcn-amd-amdhsa--gfx908]
27-
28-
// Unbundle bundle.env while providing targets with no env
29-
// RUN: clang-offload-bundler -unbundle -type=o -targets=hip-amdgcn-amd-amdhsa-gfx906,hip-amdgcn-amd-amdhsa-gfx908 -input=%t.bundle.env -output=%t-hip-amdgcn-amd-amdhsa-gfx906.bc -output=%t-hip-amdgcn-amd-amdhsa-gfx908.bc -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=BUNDLE-ENV
30-
// BUNDLE-ENV: Compatible: Exact match: [CodeObject: hip-amdgcn-amd-amdhsa--gfx906] : [Target: hip-amdgcn-amd-amdhsa--gfx906]
31-
// BUNDLE-ENV: Compatible: Exact match: [CodeObject: hip-amdgcn-amd-amdhsa--gfx908] : [Target: hip-amdgcn-amd-amdhsa--gfx908]
21+
// RUN: clang-offload-bundler -unbundle -type=o -targets=hip-amdgcn-amd-amdhsa--gfx906,hip-amdgcn-amd-amdhsa--gfx908 -input=%t.bundle -output=%t-hip-amdgcn-amd-amdhsa--gfx906.bc -output=%t-hip-amdgcn-amd-amdhsa--gfx908.bc -debug-only=CodeObjectCompatibility 2>&1 | FileCheck %s -check-prefix=BUNDLE
22+
// BUNDLE: Compatible: Exact match: [CodeObject: hip-amdgcn-amd-amdhsa--gfx906] : [Target: hip-amdgcn-amd-amdhsa--gfx906]
23+
// BUNDLE: Compatible: Exact match: [CodeObject: hip-amdgcn-amd-amdhsa--gfx908] : [Target: hip-amdgcn-amd-amdhsa--gfx908]
3224

3325
// Some code so that we can create a binary out of this file.
3426
int A = 0;

0 commit comments

Comments
 (0)