Refactor work with opencl-c.h resource file

There is no need to work with opencl-c.h file as with the resource. Instead we just can directly link against its representation as a c-array. Fixes: intel#61 Signed-off-by: Dmitry Rogozhkin <[email protected]>
dvrogozh · Apr 12, 2019 · fa5afef · fa5afef
1 parent bf7997c
commit fa5afef
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 372 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,9 +55,7 @@ include(TableGen)
 
 find_package(Git REQUIRED)
 
-if (NOT WIN32)
-    add_subdirectory( linux_linker )
-endif()
+add_subdirectory( linux_linker )
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 4)
     set(ADDR 32)
@@ -127,7 +125,6 @@ set(TARGET_INCLUDE_FILES
 set(TARGET_SOURCE_FILES
     common_clang.cpp
     options.cpp
-    pch_mgr.cpp
     options_compile.cpp
 )
 

diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
@@ -25,7 +25,6 @@ add_custom_target (
     opencl-c.h
 )
 
-
 function(pack_to_obj SRC DST TAG)
     add_custom_command (
         OUTPUT ${DST}
@@ -35,14 +34,10 @@ function(pack_to_obj SRC DST TAG)
     )
 endfunction(pack_to_obj)
 
-if(WIN32)
-    list(APPEND CL_HEADERS_SRC OpenCL.rc)
-else()
-    pack_to_obj(opencl-c.h           opencl-c.h.cpp           "PCM_OPENCL_C_H")
-    list(APPEND CL_HEADERS_SRC
-         opencl-c.h.cpp
-    )
-endif()
+pack_to_obj(opencl-c.h opencl-c.h.cpp "PCM_OPENCL_C_H")
+list(APPEND CL_HEADERS_SRC
+    opencl-c.h.cpp
+)
 
 add_library(${CL_HEADERS_LIB} OBJECT
     ${CL_HEADERS_SRC}

diff --git a/cl_headers/OpenCL.rc b/cl_headers/OpenCL.rc
diff --git a/cl_headers/resource.h b/cl_headers/resource.h
diff --git a/common_clang.cpp b/common_clang.cpp
@@ -18,7 +18,6 @@ Copyright (c) Intel Corporation (2009-2017).
 
 #include "common_clang.h"
 #include "pch_mgr.h"
-#include "cl_headers/resource.h"
 #include "binary_result.h"
 #include "options.h"
 
@@ -111,26 +110,11 @@ void CommonClangInitialize() {
   }
 }
 
-static bool GetHeaders(std::vector<Resource> &Result) {
-  struct {const char *ID; const char *Name;} Headers[] = {
-    {OPENCL_C_H,             "opencl-c.h"},
-  };
-
-  Result.clear();
-  Result.reserve(sizeof(Headers) / sizeof(*Headers));
-
-  ResourceManager &RM = ResourceManager::instance();
-
-  for (auto Header:Headers) {
-    Resource R = RM.get_resource(Header.Name, Header.ID, "PCM", true);
-    if (!R) {
-      assert(0 && "Resource not found");
-      return false;
-    }
-
-    Result.push_back(R);
-  }
+extern const char PCM_OPENCL_C_H[];
+extern unsigned int PCM_OPENCL_C_H_size;
 
+static bool GetHeaders(std::vector<Resource> &Result) {
+  Result.push_back(Resource(PCM_OPENCL_C_H, PCM_OPENCL_C_H_size, "opencl-c.h"));
   return true;
 }
 

diff --git a/common_clang.map b/common_clang.map
@@ -6,7 +6,6 @@ global:
    Compile;
    Link;
    GetKernelArgInfo;
-   PCM_OPENCL_C_H*;
  };
 local: *;
 };
diff --git a/linux_linker/linux_resource_linker.cpp b/linux_linker/linux_resource_linker.cpp
@@ -26,7 +26,7 @@ int main(int argc, char **argv)
 
     if (!argv[1] || !strcmp(argv[1], "-h") || !strcmp(argv[1], "--help") || !argv[2] || !argv[3])
     {
-        printf("Usage: bif_linker [input file] [output file] [symbol base name]\n");
+        printf("Usage: %s [input file] [output file] [symbol base name]\n", argv[0]);
         return 0;
     }
 
@@ -44,8 +44,8 @@ int main(int argc, char **argv)
         return 1;
     }
 
-    fprintf(output, "// This file is auto generated by bo_linker, DO NOT EDIT\n\n");
-    fprintf(output, "unsigned char __attribute__((visibility(\"default\"))) %s[] =\n{\n    ", argv[3]);
+    fprintf(output, "// This file is auto generated by %s, DO NOT EDIT\n\n", argv[0]);
+    fprintf(output, "extern const char %s[] =\n{\n    ", argv[3]);
 
     int count = 0;
     int is_eol;
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
     }
     fprintf(output, "0x00\n};\n\n");
 
-    fprintf(output, "unsigned int __attribute__((visibility(\"default\"))) %s_size = %d;\n\n", argv[3], count);
+    fprintf(output, "unsigned int %s_size = %d;\n\n", argv[3], count);
     fclose(input);
     fclose(output);