Windows build fixes for recent free function render services (#1502)

* Fix warnings from stdint on windows by pre-including the standard header

* Make sure register_JIT_Global is a public symbol since it needs to be called by client code

* Fix how llvm-as, llvm-link and python are invoked by cmake so they can be properly found on Windows platforms

Signed-off-by: Chris Kulla <ckulla@gmail.com>

src/cmake/cuda_macros.cmake

@@ -80,6 +80,20 @@ function ( MAKE_CUDA_BITCODE src suffix generated_bc extra_clang_args )
         message (STATUS "Using LLVM_BC_GENERATOR ${LLVM_BC_GENERATOR} to generate bitcode.")
     endif()
 
+    if (NOT LLVM_AS_TOOL)
+      find_program (LLVM_AS_TOOL NAMES "llvm-as"
+                PATHS "${LLVM_DIRECTORY}/bin" "${LLVM_DIRECTORY}/tools/llvm"
+                NO_CMAKE_PATH NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH
+                NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH)
+    endif ()
+
+    if (NOT LLVM_LINK_TOOL)
+        find_program (LLVM_LINK_TOOL NAMES "llvm-link"
+                PATHS "${LLVM_DIRECTORY}/bin" "${LLVM_DIRECTORY}/tools/llvm"
+                NO_CMAKE_PATH NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH
+                NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH)
+    endif ()
+
     if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
         # fix compilation error when using MSVC
         set (CLANG_MSVC_FIX "-DBOOST_CONFIG_REQUIRES_THREADS_HPP")
@@ -115,7 +129,7 @@ function ( MAKE_CUDA_BITCODE src suffix generated_bc extra_clang_args )
             -Wno-deprecated-register -Wno-format-security
             -O3 -fno-math-errno -ffast-math -S -emit-llvm ${extra_clang_args}
             ${src} -o ${asm_cuda}
-        COMMAND "${LLVM_DIRECTORY}/bin/llvm-as" -f -o ${bc_cuda} ${asm_cuda}
+        COMMAND ${LLVM_AS_TOOL} -f -o ${bc_cuda} ${asm_cuda}
         DEPENDS ${exec_headers} ${PROJECT_PUBLIC_HEADERS} ${src}
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" )
 endfunction ()
@@ -130,7 +144,7 @@ function ( LLVM_COMPILE_CUDA llvm_src headers prefix llvm_bc_cpp_generated extra
     MAKE_CUDA_BITCODE (${llvm_src} "" llvm_bc "${extra_clang_args}")
 
     add_custom_command (OUTPUT ${llvm_bc_cpp}
-        COMMAND python "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py" ${llvm_bc} ${llvm_bc_cpp} ${prefix}
+        COMMAND ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py" ${llvm_bc} ${llvm_bc_cpp} ${prefix}
         MAIN_DEPENDENCY ${llvm_src}
         DEPENDS "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py" ${llvm_src} ${headers} ${llvm_bc}
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" )

src/cmake/llvm_macros.cmake

@@ -34,15 +34,10 @@ function ( EMBED_LLVM_BITCODE_IN_CPP src_list suffix output_name list_to_append_
         # Figure out what program we will use to make the bitcode.
         if (NOT LLVM_BC_GENERATOR)
             find_program (LLVM_BC_GENERATOR NAMES "clang++"
-                        PATHS "${LLVM_DIRECTORY}/bin"
+                        PATHS "${LLVM_DIRECTORY}/bin" "${LLVM_DIRECTORY}/tools/llvm"
                         NO_CMAKE_PATH NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH
                         NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH)
         endif ()
-        # If that didn't work, look anywhere
-        if (NOT LLVM_BC_GENERATOR)
-            # Wasn't in their build, look anywhere
-            find_program (LLVM_BC_GENERATOR NAMES clang++ llvm-g++)
-        endif ()
 
         if (NOT LLVM_BC_GENERATOR)
             message (FATAL_ERROR "You must have a valid llvm bitcode generator (clang++) somewhere.")
@@ -51,6 +46,21 @@ function ( EMBED_LLVM_BITCODE_IN_CPP src_list suffix output_name list_to_append_
             message (STATUS "Using LLVM_BC_GENERATOR ${LLVM_BC_GENERATOR} to generate bitcode.")
         endif()
 
+        if (NOT LLVM_AS_TOOL)
+            find_program (LLVM_AS_TOOL NAMES "llvm-as"
+                        PATHS "${LLVM_DIRECTORY}/bin" "${LLVM_DIRECTORY}/tools/llvm"
+                        NO_CMAKE_PATH NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH
+                        NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH)
+        endif ()
+
+        if (NOT LLVM_LINK_TOOL)
+            find_program (LLVM_LINK_TOOL NAMES "llvm-link"
+                    PATHS "${LLVM_DIRECTORY}/bin" "${LLVM_DIRECTORY}/tools/llvm"
+                    NO_CMAKE_PATH NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH
+                    NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH)
+        endif ()
+
+
         # Fix specific problem I had on new Apple systems (e.g. Mavericks) with
         # LLVM/libc++ installed -- for some reason, LLVM 3.4 wasn't finding it,
         # so in that specific case, append another -I to point it in the right
@@ -92,7 +102,7 @@ function ( EMBED_LLVM_BITCODE_IN_CPP src_list suffix output_name list_to_append_
             -Wno-ignored-attributes -Wno-unknown-attributes
             -O3 -fno-math-errno -S -emit-llvm ${extra_clang_args}
             -o ${src_asm} ${src}
-        COMMAND "${LLVM_DIRECTORY}/bin/llvm-as" -f -o ${src_bc} ${src_asm}
+        COMMAND ${LLVM_AS_TOOL} -f -o ${src_bc} ${src_asm}
         # Do NOT setup a MAIN_DEPENDENCY because only 1 may exist 
         # and we may have the several outputs dependant on the same source 
         DEPENDS ${src} ${exec_headers} ${PROJECT_PUBLIC_HEADERS}
@@ -109,14 +119,14 @@ function ( EMBED_LLVM_BITCODE_IN_CPP src_list suffix output_name list_to_append_
     # Link all of the individual LLVM bitcode files
     set ( linked_src_bc "${CMAKE_CURRENT_BINARY_DIR}/${output_name}.bc" )
     add_custom_command ( OUTPUT ${linked_src_bc}
-        COMMAND "${LLVM_DIRECTORY}/bin/llvm-link" -internalize ${src_bc_list} -o ${linked_src_bc}
+        COMMAND ${LLVM_LINK_TOOL} -internalize ${src_bc_list} -o ${linked_src_bc}
         DEPENDS ${src_bc_list} ${exec_headers} ${PROJECT_PUBLIC_HEADERS} ${src_list}
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )
 
      # Serialize the linked bitcode into a CPP file 
     set ( src_bc_cpp "${CMAKE_CURRENT_BINARY_DIR}/${output_name}.bc.cpp" )
     add_custom_command ( OUTPUT ${src_bc_cpp}
-        COMMAND python "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py"
+        COMMAND ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py"
             ${linked_src_bc} ${src_bc_cpp} ${output_name}
         DEPENDS "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py" ${linked_src_bc}
         ${exec_headers} ${PROJECT_PUBLIC_HEADERS}

src/include/OSL/oslexec.h

@@ -33,7 +33,7 @@ template<typename DataT, int WidthT> struct Wide;
 /// only exist in the renderer's program space and won't automatically be 
 /// found when referenced in JIT'd code inside OSL.  A renderer may register
 /// the addresses of these global variables to allow valid JIT to occur.
-void register_JIT_Global(const char* global_var_name, void* global_var_addr);
+void OSLEXECPUBLIC register_JIT_Global(const char* global_var_name, void* global_var_addr);
 
 /// Opaque pointer to whatever the renderer uses to represent a
 /// (potentially motion-blurred) coordinate transformation.

src/liboslcomp/osllex.l

@@ -7,6 +7,11 @@
 /** Lexical scanner for Open Shading Language
  **/
 
+%top{
+/* Include this first to avoid warnings about re-definitions on windows */
+#include <stdint.h>
+}
+
 /************************************************************
  * Definitions section
  ************************************************************/

src/liboslexec/CMakeLists.txt

@@ -204,13 +204,13 @@ macro ( CUDA_SHADEOPS_COMPILE srclist )
 
     # Link all of the individual LLVM bitcode files
     add_custom_command ( OUTPUT ${linked_shadeops_bc}
-        COMMAND "${LLVM_DIRECTORY}/bin/llvm-link" -internalize ${shadeops_bc_list} -o ${linked_shadeops_bc}
+        COMMAND ${LLVM_LINK_TOOL} -internalize ${shadeops_bc_list} -o ${linked_shadeops_bc}
         DEPENDS ${shadeops_bc_list} ${exec_headers} ${PROJECT_PUBLIC_HEADERS} ${shadeops_srcs}
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" )
 
     # Serialize the linked bitcode into a CPP file and add it to the list of liboslexec soures
     add_custom_command ( OUTPUT ${shadeops_bc_cuda_cpp}
-        COMMAND python "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py"
+        COMMAND ${Python_EXECUTABLE} "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py"
             ${linked_shadeops_bc} ${shadeops_bc_cuda_cpp} "osl_llvm_compiled_ops_cuda"
         DEPENDS "${CMAKE_SOURCE_DIR}/src/build-scripts/serialize-bc.py" ${linked_shadeops_bc}
         ${exec_headers} ${PROJECT_PUBLIC_HEADERS}

src/liboslexec/osolex.l

@@ -7,6 +7,10 @@
 /** Lexical scanner for OpenShadingLanguage 'object' files
  **/
 
+%top{
+/* Include this first to avoid warnings about re-definitions on windows */
+#include <stdint.h>
+}
 
 /************************************************************
  * Definitions section