fixes for LLVM on Windows

Author: ix-dcourtois

CMakeLists.txt

@@ -105,25 +105,37 @@ if (ENABLE_LLVM_BACKEND)
         message(STATUS "LLVM_DEFINITIONS =" ${LLVM_DEFINITIONS})
         add_definitions(${LLVM_DEFINITIONS})
 
-        execute_process(
-            COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
-            OUTPUT_VARIABLE LLVM_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if (NOT LLVM_CONFIG_EXECUTABLE STREQUAL "LLVM_CONFIG_EXECUTABLE-NOTFOUND")
+            execute_process(
+                COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+                OUTPUT_VARIABLE LLVM_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+        else ()
+            set(LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIRS})
+        endif ()
         message(STATUS "LLVM_INCLUDE_DIR =" ${LLVM_INCLUDE_DIR})
         include_directories(${LLVM_INCLUDE_DIR})
 
-        execute_process(
-            COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
-            OUTPUT_VARIABLE LLVM_LIBRARY_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if (NOT LLVM_CONFIG_EXECUTABLE STREQUAL "LLVM_CONFIG_EXECUTABLE-NOTFOUND")
+            execute_process(
+                COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+                OUTPUT_VARIABLE LLVM_LIBRARY_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+        else ()
+            set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_DIRS})
+        endif ()
         message(STATUS "LLVM_LIBRARY_DIR =" ${LLVM_LIBRARY_DIR})
         link_directories(${LLVM_LIBRARY_DIR})
 
         #todo infinite loop in this?
         #llvm_map_components_to_libraries(REQ_LLVM_LIBRARIES jit native)
 
         # construct library name
-        execute_process(
-            COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
-            OUTPUT_VARIABLE LLVM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if (NOT LLVM_CONFIG_EXECUTABLE STREQUAL "LLVM_CONFIG_EXECUTABLE-NOTFOUND")
+            execute_process(
+                COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+                OUTPUT_VARIABLE LLVM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+        else ()
+            set(LLVM_VERSION ${LLVM_PACKAGE_VERSION})
+        endif ()
         message(STATUS "LLVM_VERSION = ${LLVM_VERSION}")
 
         set(LLVM_LIB LLVM)

src/SeExpr/CMakeLists.txt

@@ -102,5 +102,9 @@ configure_file(seexpr2.pc.in seexpr2.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/seexpr2.pc DESTINATION share/pkgconfig)
 
 if (ENABLE_LLVM_BACKEND)
-    target_link_libraries(SeExpr2 ${LLVM_LIB} "dl" "pthread")
+    if (NOT WIN32)
+        target_link_libraries(SeExpr2 ${LLVM_LIB} "dl" "pthread")
+    else ()
+        target_link_libraries(SeExpr2 ${LLVM_LIB})
+    endif ()
 endif()

src/SeExpr/Platform.cpp

@@ -0,0 +1,105 @@
+/*
+ Copyright Disney Enterprises, Inc.  All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License
+ and the following modification to it: Section 6 Trademarks.
+ deleted and replaced with:
+
+ 6. Trademarks. This License does not grant permission to use the
+ trade names, trademarks, service marks, or product names of the
+ Licensor and its affiliates, except as required for reproducing
+ the content of the NOTICE file.
+
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+*/
+
+/** @file Platform.cpp
+    @brief Platform-specific classes, functions, and includes' implementations.
+*/
+
+#include "Platform.h"
+
+#if defined(WINDOWS)
+
+#define _CRT_NONSTDC_NO_DEPRECATE 1
+#define _CRT_SECURE_NO_DEPRECATE 1
+#define NOMINMAX 1
+
+// windows - defined for both Win32 and Win64
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#include <Windows.h>
+
+namespace SeExpr2 {
+
+__int64 Timer::time() {
+    LARGE_INTEGER perfCounter;
+    QueryPerformanceCounter(&perfCounter);
+    return perfCounter.QuadPart;
+}
+
+Timer::Timer() : started(false) {
+    // get the timer frequency
+    LARGE_INTEGER frequency;
+    QueryPerformanceFrequency(&frequency);
+    ticksPerSeconds = frequency.QuadPart;
+}
+
+void Timer::start() {
+    started = true;
+    startTime = this->time();
+}
+
+long Timer::elapsedTime() {
+    stopTime = this->time();
+    return static_cast<long>(((stopTime - startTime) * 1000000) / ticksPerSeconds);
+}
+
+}
+
+namespace SeExprInternal2 {
+
+/*
+ * Mutex/SpinLock classes
+ */
+
+_Mutex::_Mutex() {
+    _mutex = CreateMutex(NULL, FALSE, NULL);
+}
+
+_Mutex::~_Mutex() {
+    CloseHandle(_mutex);
+}
+
+void _Mutex::lock() {
+    WaitForSingleObject(_mutex, INFINITE);
+}
+
+void _Mutex::unlock() {
+    ReleaseMutex(_mutex);
+}
+
+_SpinLock::_SpinLock() {
+    _spinlock = new CRITICAL_SECTION;
+    InitializeCriticalSection(reinterpret_cast<CRITICAL_SECTION*>(_spinlock));
+}
+
+_SpinLock::~_SpinLock() {
+    DeleteCriticalSection(reinterpret_cast<CRITICAL_SECTION*>(_spinlock));
+    delete _spinlock;
+    _spinlock = nullptr;
+}
+
+void _SpinLock::lock() {
+    EnterCriticalSection(reinterpret_cast<CRITICAL_SECTION*>(_spinlock));
+}
+
+void _SpinLock::unlock() {
+    LeaveCriticalSection(reinterpret_cast<CRITICAL_SECTION*>(_spinlock));
+}
+
+}
+
+#endif // defined(WINDOWS)

src/SeExpr/Platform.h

@@ -34,10 +34,16 @@
 #endif
 #define _CRT_NONSTDC_NO_DEPRECATE 1
 #define _CRT_SECURE_NO_DEPRECATE 1
+#if !defined(NOMINMAX)
 #define NOMINMAX 1
+#endif
+
+// note: because there are some conflicts preventing the use of
+// windows.h and COFF.h (one of LLVM include files) in the same
+// compilation unit (https://groups.google.com/forum/#!topic/llvm-dev/6n5Q0pFdaSA)
+// do NOT include windows.h here. The Windows implementation is
+// done on the Platform.cpp file, using opaque types.
 
-// windows - defined for both Win32 and Win64
-#include <Windows.h>
 #include <malloc.h>
 #include <io.h>
 #include <tchar.h>
@@ -77,8 +83,12 @@ inline double log2(double x) { return log(x) * 1.4426950408889634; }
 typedef unsigned int uint32_t;
 #define M_E (2.7182818284590452354)
 #define M_PI (3.141592653589793238)
+#if !defined(UINT32_MAX)
 #define UINT32_MAX (0xffffffff)
+#endif
+#if !defined(UINT32_MAX)
 #define UINT32_MIN (0)
+#endif
 #else
 typedef off_t FilePos;
 #endif
@@ -125,33 +135,15 @@ class Timer {
 };
 #else  // Windows
 class Timer {
+    __int64 time();
     __int64 ticksPerSeconds;
     __int64 startTime, stopTime;
     bool started;
 
-    __int64 time() {
-        LARGE_INTEGER perfCounter;
-        QueryPerformanceCounter(&perfCounter);
-        return perfCounter.QuadPart;
-    }
-
   public:
-    Timer() : started(false) {
-        // get the timer frequency
-        LARGE_INTEGER frequency;
-        QueryPerformanceFrequency(&frequency);
-        ticksPerSeconds = frequency.QuadPart;
-    }
-
-    void start() {
-        started = true;
-        startTime = this->time();
-    }
-
-    long elapsedTime() {
-        stopTime = this->time();
-        return static_cast<long>(((stopTime - startTime) * 1000000) / ticksPerSeconds);
-    }
+    Timer();
+    void start();
+    long elapsedTime();
 };
 #endif
 
@@ -178,24 +170,24 @@ namespace SeExprInternal2 {
 
 class _Mutex {
   public:
-    _Mutex() { _mutex = CreateMutex(NULL, FALSE, NULL); }
-    ~_Mutex() { CloseHandle(_mutex); }
-    void lock() { WaitForSingleObject(_mutex, INFINITE); }
-    void unlock() { ReleaseMutex(_mutex); }
+    _Mutex();
+    ~_Mutex();
+    void lock();
+    void unlock();
 
   private:
-    HANDLE _mutex;
+    void* _mutex;
 };
 
 class _SpinLock {
   public:
-    _SpinLock() { InitializeCriticalSection(&_spinlock); }
-    ~_SpinLock() { DeleteCriticalSection(&_spinlock); }
-    void lock() { EnterCriticalSection(&_spinlock); }
-    void unlock() { LeaveCriticalSection(&_spinlock); }
+    _SpinLock();
+    ~_SpinLock();
+    void lock();
+    void unlock();
 
   private:
-    CRITICAL_SECTION _spinlock;
+    void* _spinlock;
 };
 
 #else