Add new test for fno-bundle-offload-arch and fix other tests

Author: Hugh Delaney

clang/test/Driver/sycl-cuda-tu-offload.cu

@@ -93,8 +93,8 @@
 // DEFAULT-PHASES2:|           |     +- 69: input, "{{.*}}", object
 // DEFAULT-PHASES2:|           |  +- 70: clang-offload-unbundler, {69}, object
 // DEFAULT-PHASES2:|           |- 71: offload, " (nvptx64-nvidia-cuda)" {70}, object
-// DEFAULT-PHASES2:|           |- 72: input, "{{.*}}", object, (device-sycl, sm_80)
-// DEFAULT-PHASES2:|           |- 73: input, "{{.*}}libdevice.10.bc", object, (device-sycl, sm_80)
+// DEFAULT-PHASES2:|           |- 72: input, "{{.*}}nvidiacl.bc", ir, (device-sycl, sm_80)
+// DEFAULT-PHASES2:|           |- 73: input, "{{.*}}libdevice.10.bc", ir, (device-sycl, sm_80)
 // DEFAULT-PHASES2:|        +- 74: linker, {17, 20, 23, 26, 29, 32, 35, 38, 41, 44, 47, 50, 53, 56, 59, 62, 65, 68, 71, 72, 73}, ir, (device-sycl, sm_80)
 // DEFAULT-PHASES2:|     +- 75: sycl-post-link, {74}, ir, (device-sycl, sm_80)
 // DEFAULT-PHASES2:|     |  +- 76: file-table-tform, {75}, ir, (device-sycl, sm_80)

clang/test/Driver/sycl-no-bundle-offload-arch.cpp

@@ -0,0 +1,13 @@
+// RUN: %clangxx -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda \
+// RUN:   -fno-bundle-offload-arch -c %s 2>&1 \
+// RUN: | FileCheck -check-prefix=CHK-BUNDLE-TAG-OBJ %s
+//
+// CHK-BUNDLE-TAG-OBJ-NOT: clang-offload-bundler{{.*}}-targets=sycl-nvptx64-nvidia-cuda-sm_"
+
+// RUN: %clangxx -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda \
+// RUN:   -fno-bundle-offload-arch %s 2>&1 \
+// RUN: | FileCheck -check-prefix=CHK-BUNDLE-TAG %s
+//
+// CHK-BUNDLE-TAG-NOT: clang-offload-bundler{{.*}}-targets=sycl-nvptx64-nvidia-cuda-sm_"
+
+void func(){};

clang/test/Driver/sycl-offload-nvptx.cpp

@@ -106,8 +106,8 @@
 // CHK-PHASES-NO-CC: 63: input, "{{.*}}libsycl-itt-stubs.o", object
 // CHK-PHASES-NO-CC: 64: clang-offload-unbundler, {63}, object
 // CHK-PHASES-NO-CC: 65: offload, " (nvptx64-nvidia-cuda)" {64}, object
-// CHK-PHASES-NO-CC: 66: input, "{{.*}}spirv-nvptx64--nvidiacl.bc", object, (device-sycl, sm_50)
-// CHK-PHASES-NO-CC: 67: input, "{{.*}}libdevice{{.*}}bc", object, (device-sycl, sm_50)
+// CHK-PHASES-NO-CC: 66: input, "{{.*}}nvidiacl.bc", ir, (device-sycl, sm_50)
+// CHK-PHASES-NO-CC: 67: input, "{{.*}}libdevice{{.*}}bc", ir, (device-sycl, sm_50)
 // CHK-PHASES-NO-CC: 68: linker, {11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41, 44, 47, 50, 53, 56, 59, 62, 65, 66, 67}, ir, (device-sycl, sm_50)
 // CHK-PHASES-NO-CC: 69: sycl-post-link, {68}, ir, (device-sycl, sm_50)
 // CHK-PHASES-NO-CC: 70: file-table-tform, {69}, ir, (device-sycl, sm_50)
@@ -194,8 +194,8 @@
 // CHK-PHASES: 63: input, "{{.*}}libsycl-itt-stubs.o", object
 // CHK-PHASES: 64: clang-offload-unbundler, {63}, object
 // CHK-PHASES: 65: offload, " (nvptx64-nvidia-cuda)" {64}, object
-// CHK-PHASES: 66: input, "{{.*}}spirv-nvptx64--nvidiacl.bc", object, (device-sycl, sm_35)
-// CHK-PHASES: 67: input, "{{.*}}libdevice{{.*}}bc", object, (device-sycl, sm_35)
+// CHK-PHASES: 66: input, "{{.*}}nvidiacl.bc", ir, (device-sycl, sm_35)
+// CHK-PHASES: 67: input, "{{.*}}libdevice{{.*}}bc", ir, (device-sycl, sm_35)
 // CHK-PHASES: 68: linker, {11, 14, 17, 20, 23, 26, 29, 32, 35, 38, 41, 44, 47, 50, 53, 56, 59, 62, 65, 66, 67}, ir, (device-sycl, sm_35)
 // CHK-PHASES: 69: sycl-post-link, {68}, ir, (device-sycl, sm_35)
 // CHK-PHASES: 70: file-table-tform, {69}, ir, (device-sycl, sm_35)