Merge from 'sycl' to 'sycl-web'

Author: iclsrc

clang/lib/Driver/Driver.cpp

@@ -2783,7 +2783,7 @@ bool Driver::checkForOffloadStaticLib(Compilation &C,
       !Args.hasArg(options::OPT_fopenmp_targets_EQ))
     return false;
 
-  // Right off the bat, assume the presense of -foffload-static-lib means
+  // Right off the bat, assume the presence of -foffload-static-lib means
   // the need to perform linking steps for fat static archive offloading.
   // TODO: remove when -foffload-static-lib support is dropped.
   if (Args.hasArg(options::OPT_offload_lib_Group))

sycl/source/detail/config.def

@@ -17,3 +17,5 @@ CONFIG(SYCL_BE, 16, __SYCL_BE)
 CONFIG(SYCL_PI_TRACE, 16, __SYCL_PI_TRACE)
 CONFIG(SYCL_DEVICELIB_NO_FALLBACK, 1, __SYCL_DEVICELIB_NO_FALLBACK)
 CONFIG(SYCL_DEVICE_FILTER, 1024, __SYCL_DEVICE_FILTER)
+CONFIG(SYCL_PROGRAM_LINK_OPTIONS, 64, __SYCL_PROGRAM_LINK_OPTIONS)
+CONFIG(SYCL_PROGRAM_COMPILE_OPTIONS, 64, __SYCL_PROGRAM_COMPILE_OPTIONS)

sycl/source/detail/program_impl.cpp

@@ -11,6 +11,7 @@
 #include <CL/sycl/detail/pi.h>
 #include <CL/sycl/kernel.hpp>
 #include <CL/sycl/property_list.hpp>
+#include <detail/config.hpp>
 #include <detail/kernel_impl.hpp>
 #include <detail/program_impl.hpp>
 #include <detail/spec_constant_impl.hpp>
@@ -291,9 +292,13 @@ void program_impl::link(string_class LinkOptions) {
     check_device_feature_support<info::device::is_linker_available>(MDevices);
     vector_class<RT::PiDevice> Devices(get_pi_devices());
     const detail::plugin &Plugin = getPlugin();
+    const char *LinkOpts = SYCLConfig<SYCL_PROGRAM_LINK_OPTIONS>::get();
+    if (!LinkOpts) {
+      LinkOpts = LinkOptions.c_str();
+    }
     RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piProgramLink>(
-        MContext->getHandleRef(), Devices.size(), Devices.data(),
-        LinkOptions.c_str(), 1, &MProgram, nullptr, nullptr, &MProgram);
+        MContext->getHandleRef(), Devices.size(), Devices.data(), LinkOpts,
+        /*num_input_programs*/ 1, &MProgram, nullptr, nullptr, &MProgram);
     Plugin.checkPiResult<compile_program_error>(Err);
     MLinkOptions = LinkOptions;
     MBuildOptions = LinkOptions;
@@ -363,8 +368,12 @@ void program_impl::compile(const string_class &Options) {
   check_device_feature_support<info::device::is_compiler_available>(MDevices);
   vector_class<RT::PiDevice> Devices(get_pi_devices());
   const detail::plugin &Plugin = getPlugin();
+  const char *CompileOpts = SYCLConfig<SYCL_PROGRAM_COMPILE_OPTIONS>::get();
+  if (!CompileOpts) {
+    CompileOpts = Options.c_str();
+  }
   RT::PiResult Err = Plugin.call_nocheck<PiApiKind::piProgramCompile>(
-      MProgram, Devices.size(), Devices.data(), Options.c_str(), 0, nullptr,
+      MProgram, Devices.size(), Devices.data(), CompileOpts, 0, nullptr,
       nullptr, nullptr, nullptr);
 
   if (Err != PI_SUCCESS) {

sycl/source/detail/scheduler/graph_builder.cpp

@@ -355,6 +355,7 @@ Command *Scheduler::GraphBuilder::insertMemoryMove(MemObjRecord *Record,
 
     if ((Req->MAccessMode == access::mode::discard_write) ||
         (Req->MAccessMode == access::mode::discard_read_write)) {
+      Record->MCurContext = Queue->getContextImplPtr();
       return nullptr;
     } else {
       // Full copy of buffer is needed to avoid loss of data that may be caused

sycl/unittests/scheduler/CMakeLists.txt

@@ -8,7 +8,7 @@ add_sycl_unittest(SchedulerTests OBJECT
     WaitAfterCleanup.cpp
     LinkedAllocaDependencies.cpp
     LeavesCollection.cpp
-    NoUnifiedHostMemory.cpp
+    NoHostUnifiedMemory.cpp
     StreamInitDependencyOnHost.cpp
     InOrderQueueDeps.cpp
     utils.cpp

sycl/unittests/scheduler/NoUnifiedHostMemory.cpp renamed to sycl/unittests/scheduler/NoHostUnifiedMemory.cpp

@@ -1,4 +1,4 @@
-//==----------- NoUnifiedHostMemory.cpp --- Scheduler unit tests -----------==//
+//==----------- NoHostUnifiedMemory.cpp --- Scheduler unit tests -----------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -62,7 +62,7 @@ static pi_result redefinedEnqueueMemBufferWriteRect(
 
 static pi_result redefinedMemRelease(pi_mem mem) { return PI_SUCCESS; }
 
-TEST_F(SchedulerTest, NoUnifiedHostMemory) {
+TEST_F(SchedulerTest, NoHostUnifiedMemory) {
   platform Plt{default_selector()};
   if (Plt.is_host()) {
     std::cout << "Not run due to host-only environment\n";
@@ -144,4 +144,26 @@ TEST_F(SchedulerTest, NoUnifiedHostMemory) {
     detail::Command *MemoryMove = MS.insertMemoryMove(Record, &Req, QImpl);
     EXPECT_EQ(MemoryMove->getType(), detail::Command::COPY_MEMORY);
   }
+  // Check that memory movement operations work correctly with/after discard
+  // access modes.
+  {
+    int val;
+    buffer<int, 1> Buf(&val, range<1>(1));
+    detail::Requirement Req = getMockRequirement(Buf);
+    ExpectedMemObjFlags = PI_MEM_FLAGS_ACCESS_RW | PI_MEM_FLAGS_HOST_PTR_COPY;
+
+    detail::Requirement DiscardReq = getMockRequirement(Buf);
+    DiscardReq.MAccessMode = access::mode::discard_read_write;
+
+    detail::MemObjRecord *Record = MS.getOrInsertMemObjRecord(QImpl, &Req);
+    MS.getOrCreateAllocaForReq(Record, &Req, QImpl);
+    MS.getOrCreateAllocaForReq(Record, &Req, DefaultHostQueue);
+
+    // Memory movement operations should be omitted for discard access modes.
+    detail::Command *MemoryMove =
+        MS.insertMemoryMove(Record, &DiscardReq, DefaultHostQueue);
+    EXPECT_EQ(MemoryMove, nullptr);
+    // The current context for the record should still be modified.
+    EXPECT_EQ(Record->MCurContext, DefaultHostQueue->getContextImplPtr());
+  }
 }