Fixes to bin2cpp when reading binary files on windows

shehzan10 · pavanky · commit 1db2c19a9eec · 2016-08-15T13:06:59.000-04:00
diff --git a/CMakeModules/CLKernelToH.cmake b/CMakeModules/CLKernelToH.cmake
@@ -28,7 +28,7 @@ include(CMakeParseArguments)
 set(BIN2CPP_PROGRAM "bin2cpp")
 
 function(CL_KERNEL_TO_H)
-    cmake_parse_arguments(RTCS "" "VARNAME;EXTENSION;OUTPUT_DIR;TARGETS;NAMESPACE;EOF" "SOURCES" ${ARGN})
+    cmake_parse_arguments(RTCS "" "VARNAME;EXTENSION;OUTPUT_DIR;TARGETS;NAMESPACE;BINARY;EOF" "SOURCES" ${ARGN})
 
     set(_output_files "")
     foreach(_input_file ${RTCS_SOURCES})
@@ -38,6 +38,11 @@ function(CL_KERNEL_TO_H)
         get_filename_component(_name_we "${_input_file}" NAME_WE)
 
         set(_namespace "${RTCS_NAMESPACE}")
+        set(_binary "")
+        if(${RTCS_BINARY})
+            set(_binary "--binary")
+        endif(${RTCS_BINARY})
+
         string(REPLACE "." "_" var_name ${var_name})
 
         set(_output_path "${CMAKE_CURRENT_BINARY_DIR}/${RTCS_OUTPUT_DIR}")
@@ -48,7 +53,7 @@ function(CL_KERNEL_TO_H)
             DEPENDS ${_input_file} ${BIN2CPP_PROGRAM}
             COMMAND ${CMAKE_COMMAND} -E make_directory "${_output_path}"
             COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\<${_path}/${_name_we}.hpp\\>"  >>"${_output_file}"
-            COMMAND ${BIN2CPP_PROGRAM} --file ${_name} --namespace ${_namespace} --output ${_output_file} --name ${var_name} --eof ${RTCS_EOF}
+            COMMAND ${BIN2CPP_PROGRAM} --file ${_name} --namespace ${_namespace} --output ${_output_file} --name ${var_name} ${_binary} --eof ${RTCS_EOF}
             WORKING_DIRECTORY "${_path}"
             COMMENT "Compiling ${_input_file} to C++ source"
         )
diff --git a/CMakeModules/bin2cpp.cpp b/CMakeModules/bin2cpp.cpp
@@ -22,6 +22,7 @@ xxd but adds support for namespaces.
 | --file        | input file                                                        |
 | --output      | output file (If no output is specified then it prints to stdout   |
 | --type        | Type of variable (default: char)                                  |
+| --binary      | If the file contents are in binary form                           |
 | --namespace   | A space seperated list of namespaces                              |
 | --formatted   | Tabs for formatting                                               |
 | --version     | Prints my name                                                    |
@@ -47,6 +48,7 @@ namespace blah {
 }
 
 static bool formatted;
+static bool binary = false;
 
 void add_tabs(const int level ){
     if(formatted) {
@@ -74,6 +76,9 @@ parse_options(const vector<string>& args) {
         if(arg == "--verbose") {
             verbose = true;
         }
+        else if(arg == "--binary") {
+            binary = true;
+        }
         else if(arg == "--formatted") {
             formatted = true;
         }
@@ -150,7 +155,7 @@ int main(int argc, const char * const * const argv)
     // Always create unsigned char to avoid narrowing
     cout << "static const " << "unsigned char" << " " << options["--name"] << "_uchar [] = {\n";
 
-    ifstream input(options["--file"]);
+    ifstream input(options["--file"], (binary ? std::ios::binary : std::ios::in));
     size_t char_cnt = 0;
     add_tabs(++level);
     for(char i; input.get(i);) {
diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
@@ -348,6 +348,7 @@ IF (${libdevice_bc_len} GREATER 0)
     OUTPUT_DIR ${libdevice_headers}
     TARGETS libdevice_targets
     NAMESPACE "cuda"
+    BINARY TRUE
     EOF "1"
     )
 

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,7 @@ IF (${libdevice_bc_len} GREATER 0)`
`348`	`348`	`OUTPUT_DIR ${libdevice_headers}`
`349`	`349`	`TARGETS libdevice_targets`
`350`	`350`	`NAMESPACE "cuda"`
	`351`	`+ BINARY TRUE`
`351`	`352`	`EOF "1"`
`352`	`353`	`)`
`353`	`354`