Merge from 'sycl' to 'sycl-web' (#1)

Ralender · Oct 25, 2019 · a8fe49f · a8fe49f
2 parents fc89011 + 84992a5
commit a8fe49f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
@@ -3309,7 +3309,7 @@ class OffloadingActionBuilder final {
       if (auto *IA = dyn_cast<InputAction>(HostAction)) {
         SYCLDeviceActions.clear();
 
-        std::string InputName = IA->getInputArg().getValue();
+        std::string InputName = IA->getInputArg().getAsString(Args);
         // Objects should already be consumed with -foffload-static-lib
         if (Args.hasArg(options::OPT_foffload_static_lib_EQ) &&
             IA->getType() == types::TY_Object && isObjectFile(InputName))
@@ -3791,7 +3791,7 @@ class OffloadingActionBuilder final {
     if (CanUseBundler && isa<InputAction>(HostAction) &&
         InputArg->getOption().getKind() == llvm::opt::Option::InputClass &&
         !types::isSrcFile(HostAction->getType())) {
-      std::string InputName = InputArg->getValue();
+      std::string InputName = InputArg->getAsString(Args);
       // Do not create an unbundling action for an object when we know a fat
       // static library is being used.  A separate unbundling action is created
       // for all objects and the fat static library.
@@ -5963,12 +5963,13 @@ bool clang::driver::isOptimizationLevelFast(const ArgList &Args) {
 }
 
 bool clang::driver::isObjectFile(std::string FileName) {
-  if (llvm::sys::path::has_extension(FileName)) {
-    std::string Ext(llvm::sys::path::extension(FileName).drop_front());
-    // We cannot rely on lookupTypeForExtension solely as that has 'lib'
-    // marked as an object.
-    return (Ext != "lib" &&
-            types::lookupTypeForExtension(Ext) == types::TY_Object);
-  }
-  return false;
+  if (!llvm::sys::path::has_extension(FileName))
+    // Any file with no extension should be considered an Object. Take into
+    // account -lsomelib library filenames.
+    return FileName.rfind("-l", 0) != 0;
+  std::string Ext(llvm::sys::path::extension(FileName).drop_front());
+  // We cannot rely on lookupTypeForExtension solely as that has 'lib'
+  // marked as an object.
+  return (Ext != "lib" &&
+          types::lookupTypeForExtension(Ext) == types::TY_Object);
 }
diff --git a/clang/test/Driver/sycl-offload.c b/clang/test/Driver/sycl-offload.c
@@ -238,9 +238,13 @@
 /// Check separate compilation with offloading - unbundling actions
 // RUN:   touch %t.o
 // RUN:   %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -o %t.out -lsomelib -fsycl-targets=spir64-unknown-linux-sycldevice %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHK-UBACTIONS %s
+// RUN:   | FileCheck -DINPUT=%t.o -check-prefix=CHK-UBACTIONS %s
+// RUN:   mkdir -p %t_dir
+// RUN:   touch %t_dir/dummy
+// RUN:   %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -o %t.out -lsomelib -fsycl-targets=spir64-unknown-linux-sycldevice %t_dir/dummy 2>&1 \
+// RUN:   | FileCheck -DINPUT=%t_dir/dummy -check-prefix=CHK-UBACTIONS %s
 // CHK-UBACTIONS: 0: input, "somelib", object, (host-sycl)
-// CHK-UBACTIONS: 1: input, "[[INPUT:.+\.o]]", object, (host-sycl)
+// CHK-UBACTIONS: 1: input, "[[INPUT]]", object, (host-sycl)
 // CHK-UBACTIONS: 2: clang-offload-unbundler, {1}, object, (host-sycl)
 // CHK-UBACTIONS: 3: linker, {0, 2}, image, (host-sycl)
 // CHK-UBACTIONS: 4: linker, {2}, spirv, (device-sycl)

diff --git a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVStream.h b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVStream.h
@@ -44,6 +44,7 @@
 #include "SPIRVExtInst.h"
 #include "SPIRVModule.h"
 #include <algorithm>
+#include <cctype>
 #include <cstdint>
 #include <iostream>
 #include <iterator>

diff --git a/sycl/test/basic_tests/half_type.cpp b/sycl/test/basic_tests/half_type.cpp
@@ -193,10 +193,7 @@ inline bool bitwise_comparison_fp32(const half val, const uint32_t exp) {
 }
 
 int main() {
-  // We assert that the length is 1 because we use env to select the device
-  assert(device::get_devices().size() == 1);
-
-  auto dev = device::get_devices()[0];
+  device dev{default_selector()};
   if (!dev.is_host() && !dev.has_extension("cl_khr_fp16")) {
     std::cout << "This device doesn't support the extension cl_khr_fp16"
               << std::endl;
@@ -210,7 +207,7 @@ int main() {
   buffer<half, 1> a{vec_a.data(), r};
   buffer<half, 1> b{vec_b.data(), r};
 
-  queue q;
+  queue q {dev};
 
   verify_add(q, a, b, r, 7.0);
   verify_min(q, a, b, r, 3.0);