applied comments, moved to source directory and update test to check

side effects of env var.

Signed-off-by: Vlad Romanov <[email protected]>

Author: romanovvlad

sycl/include/CL/sycl/detail/config.def

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <CL/sycl/detail/config.hpp>
+#include <detail/config.hpp>
 
 #include <cstring>
 #include <fstream>
@@ -20,17 +20,17 @@ namespace cl {
 namespace sycl {
 namespace detail {
 
-#ifndef SYCL_CONFIG_NAME
-#define SYCL_CONFIG_NAME sycl.cfg
-#endif // SYCL_CONFIG_NAME
+#ifndef SYCL_CONFIG_FILE_NAME
+#define SYCL_CONFIG_FILE_NAME "sycl.cfg"
+#endif // SYCL_CONFIG_FILE_NAME
 
 #define CONFIG(Name, MaxSize, CompileTimeDef)                                  \
   const char *SYCLConfigBase<Name>::MValueFromFile = nullptr;                  \
   char SYCLConfigBase<Name>::MStorage[MaxSize];                                \
   const char *const SYCLConfigBase<Name>::MCompileTimeDef =                    \
       getStrOrNullptr(STRINGIFY_LINE(CompileTimeDef));                         \
   const char *const SYCLConfigBase<Name>::MConfigName = STRINGIFY_LINE(Name);
-#include <CL/sycl/detail/config.def>
+#include <detail/config.def>
 #undef CONFIG
 
 #define MAX_CONFIG_NAME 256
@@ -42,7 +42,7 @@ static void initValue(const char *Key, const char *Value) {
     SYCLConfigBase<Name>::MValueFromFile = SYCLConfigBase<Name>::MStorage;     \
     return;                                                                    \
   }
-#include <CL/sycl/detail/config.def>
+#include <detail/config.def>
 #undef CONFIG
 }
 
@@ -52,9 +52,8 @@ void readConfig() {
     return;
   std::fstream File;
   // TODO: Find libsycl.so location.
-  static const char *ConfigFile = getenv("SYCL_CONFIG_FILE");
-  const char *FileToLoad =
-      ConfigFile ? ConfigFile : STRINGIFY_LINE(SYCL_CONFIG_NAME);
+  static const char *ConfigFile = getenv("SYCL_CONFIG_FILE_NAME");
+  const char *FileToLoad = ConfigFile ? ConfigFile : SYCL_CONFIG_FILE_NAME;
   File.open(FileToLoad, std::ios::in);
   if (File.is_open()) {
     // TODO: Use max size from macro instead of 256
@@ -93,7 +92,7 @@ void dumpConfig() {
   const char *Val = SYCLConfig<Name>::get();                                   \
   std::cerr << SYCLConfigBase<Name>::MConfigName << " : "                      \
             << (Val ? Val : "unset") << std::endl;
-#include <CL/sycl/detail/config.def>
+#include <detail/config.def>
 #undef CONFIG
 }
 

sycl/include/CL/sycl/detail/config.hpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <CL/sycl/access/access.hpp>
-#include <CL/sycl/detail/config.hpp>
+#include <detail/config.hpp>
 #include <CL/sycl/detail/event_impl.hpp>
 #include <CL/sycl/detail/memory_manager.hpp>
 #include <CL/sycl/detail/queue_impl.hpp>

sycl/source/detail/config.cpp

@@ -29,6 +29,7 @@ configure_lit_site_cfg(
 list(APPEND SYCL_TEST_DEPS
   sycl-toolchain
   FileCheck
+  not
   get_device_count_by_type
   llvm-config
   )

sycl/source/detail/scheduler/graph_builder.cpp

@@ -5,32 +5,22 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-// RUN: %clangxx -g -O0 -fsycl %s -o %t1.out
-// RUN: %clangxx -g -O0 -fsycl %s -o %t2.out
-// RUN: echo "SYCL_PRINT_EXECUTION_GRAPH=ValueFromConfigFile" > %t3.cfg
-// RUN: env SYCL_CONFIG_FILE=%t3.cfg env SYCL_PRINT_EXECUTION_GRAPH=VlaueFromEnvVar %t1.out
-// RUN: env SYCL_CONFIG_FILE=%t3.cfg %t1.out
-// RUN: %t2.out
+// RUN: %clangxx -g -O0 -fsycl %s -o %t.out
+// RUN: echo "SYCL_PRINT_EXECUTION_GRAPH=always" > %t.cfg
+// RUN: env SYCL_CONFIG_FILE_NAME=%t.cfg %t.out
+// RUN: ls | grep dot
+// RUN: rm *.dot
+// RUN: env SYCL_PRINT_EXECUTION_GRAPH=always %t.out
+// RUN: ls | grep dot
+// RUN: rm *.dot
+// RUN: %t.out
+// RUN: ls | not grep dot
 
-#include <CL/sycl/detail/config.hpp>
+#include <CL/sycl.hpp>
 
-#include <cstring>
+using namespace cl;
 
 int main() {
-  const char *Val = cl::sycl::detail::SYCLConfig<
-      cl::sycl::detail::SYCL_PRINT_EXECUTION_GRAPH>::get();
-
-  if (getenv("SYCL_PRINT_EXECUTION_GRAPH")) {
-    if (!Val)
-      return 1;
-    return strcmp(Val, "VlaueFromEnvVar");
-  }
-
-  if (getenv("SYCL_CONFIG_FILE")) {
-    if(!Val)
-      return 1;
-    return strcmp(Val, "ValueFromConfigFile");
-  }
-
-  return nullptr != Val;
+  sycl::buffer<int, 1> Buf(sycl::range<1>{1});
+  auto Acc = Buf.get_access<sycl::access::mode::read>();
 }