Skip to content

Commit c718ec9

Browse files
srividya-sundaramsrividya-sundaram
committed
Fix failing test.
1 parent 4692758 commit c718ec9

File tree

2 files changed

+11
-56
lines changed

2 files changed

+11
-56
lines changed

‎clang/lib/Driver/Driver.cpp‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,10 +1078,6 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
10781078
false) ||
10791079
C.getInputArgs().hasArg(options::OPT_fsycl_device_only);
10801080

1081-
bool IsSYCLOffloadArchEnabled =
1082-
HasValidSYCLRuntime &&
1083-
C.getInputArgs().hasArg(options::OPT_offload_arch_EQ);
1084-
10851081
Arg *SYCLfpga = C.getInputArgs().getLastArg(options::OPT_fintelfpga);
10861082

10871083
// Make -fintelfpga flag imply -fsycl.
@@ -1303,6 +1299,16 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
13031299
else if (HasValidSYCLRuntime &&
13041300
C.getInputArgs().hasArg(options::OPT_offload_arch_EQ) && !IsHIP &&
13051301
!IsCuda) {
1302+
// SYCL offloading to Intel CPUs and Intel GPUs with ``--offload-arch``
1303+
// is currently enabled only with ``--offload-new-driver`` option.
1304+
// Emit a diagnostic if ``--offload-arch`` is invoked without
1305+
// ``--offload-new driver`` option.
1306+
if (!C.getInputArgs().hasFlag(options::OPT_offload_new_driver,
1307+
options::OPT_no_offload_new_driver,
1308+
false)) {
1309+
Diag(clang::diag::err_drv_sycl_offload_arch_new_driver);
1310+
return;
1311+
}
13061312
const ToolChain *HostTC = C.getSingleOffloadToolChain<Action::OFK_Host>();
13071313
auto AMDTriple = getHIPOffloadTargetTriple(*this, C.getInputArgs());
13081314
auto NVPTXTriple = getNVIDIAOffloadTargetTriple(*this, C.getInputArgs(),
@@ -1365,19 +1371,7 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
13651371
llvm::Triple SYCLTargetTriple(MakeSYCLDeviceTriple(Val.getKey()));
13661372
std::string NormalizedName = SYCLTargetTriple.normalize();
13671373

1368-
// SYCL offloading to Intel CPUs and Intel GPUs with ``--offload-arch``
1369-
// is currently enabled only with ``--offload-new-driver`` option.
1370-
// Emit a diagnostic if ``--offload-arch`` is invoked without
1371-
// ``--offload-new driver`` option.
1372-
if (SYCLTargetTriple != NVPTXTriple && SYCLTargetTriple != AMDTriple) {
1373-
if (IsSYCLOffloadArchEnabled &&
1374-
!C.getInputArgs().hasFlag(options::OPT_offload_new_driver,
1375-
options::OPT_no_offload_new_driver,
1376-
false)) {
1377-
Diag(clang::diag::err_drv_sycl_offload_arch_new_driver);
1378-
return;
1379-
}
1380-
}
1374+
13811375

13821376
// Make sure we don't have a duplicate triple.
13831377
auto Duplicate = FoundNormalizedTriples.find(NormalizedName);

‎clang/test/Driver/sycl-offload-arch-amd-gpu-cpu.cpp‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx1013 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
4848
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-GPU,CLANG-OFFLOAD-PACKAGER-AMD -DDEV_STR=gfx1013 -DMAC_STR=GFX1013
4949

50-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx1013 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
51-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-GPU,CLANG-OFFLOAD-PACKAGER-AMD -DDEV_STR=gfx1013 -DMAC_STR=GFX1013
52-
5350
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx1030 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
5451
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-GPU,CLANG-OFFLOAD-PACKAGER-AMD -DDEV_STR=gfx1030 -DMAC_STR=GFX1030
5552

@@ -91,15 +88,6 @@
9188

9289
// AMD CPUs
9390

94-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx600 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
95-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx600
96-
97-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx601 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
98-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx601
99-
100-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx602 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
101-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx602
102-
10391
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx700 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
10492
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx700
10593

@@ -109,18 +97,6 @@
10997
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx702 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
11098
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx702
11199

112-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx702 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
113-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx702
114-
115-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx703 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
116-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx703
117-
118-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx704 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
119-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx704
120-
121-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx705 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
122-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx705
123-
124100
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx801 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
125101
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx801
126102

@@ -136,24 +112,12 @@
136112
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx810 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
137113
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx810
138114

139-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx9-generic -nogpulib -fno-sycl-libspirv %s 2>&1 | \
140-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx9-generic
141-
142-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx1152 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
143-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx1152
144-
145115
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx1200 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
146116
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx1200
147117

148118
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx1201 -nogpulib -fno-sycl-libspirv %s 2>&1 | \
149119
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx1201
150120

151-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=gfx12-generic -nogpulib -fno-sycl-libspirv %s 2>&1 | \
152-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-CPU,CLANG-OFFLOAD-PACKAGER-AMD-CPU -DDEV_STR=gfx12-generic
153-
154-
// RUN: %clangxx -### --offload-new-driver -fsycl --offload-arch=amdgcnspirv -nogpulib -fno-sycl-libspirv %s 2>&1 | \
155-
// RUN: FileCheck %s --check-prefixes=TARGET-TRIPLE-AMD-SPIRV,CLANG-OFFLOAD-PACKAGER-AMD-SPIRV -DDEV_STR=amdgcnspirv
156-
157121
// TARGET-TRIPLE-AMD-GPU: clang{{.*}} "-triple" "amdgcn-amd-amdhsa"
158122
// TARGET-TRIPLE-AMD-GPU: "-D__SYCL_TARGET_AMD_GPU_[[MAC_STR]]__"
159123
// CLANG-OFFLOAD-PACKAGER-AMD: clang-offload-packager{{.*}} "--image={{.*}}triple=amdgcn-amd-amdhsa,arch=[[DEV_STR]],kind=sycl"
@@ -165,6 +129,3 @@
165129
// TARGET-TRIPLE-AMD-SPIRV: clang{{.*}} "-triple" "spirv64-amd-amdhsa"
166130
// CLANG-OFFLOAD-PACKAGER-AMD-SPIRV: clang-offload-packager{{.*}} "--image={{.*}}triple=spirv64-amd-amdhsa,arch=[[DEV_STR]],kind=sycl,{{.*}}"
167131

168-
// TARGET-TRIPLE-AMD-GENERIC: clang{{.*}} "-triple" "spirv64-amd-amdhsa"
169-
// CLANG-OFFLOAD-PACKAGER-AMD-GENERIC: clang-offload-packager{{.*}} "--image={{.*}}triple=spirv64-amd-amdhsa,arch=[[DEV_STR]],kind=sycl,{{.*}}"
170-

0 commit comments

Comments
 (0)