Rename SWIFTSHADER_LLVM_VERSION to REACTOR_LLVM_VERSION.

Android.mk

@@ -18,10 +18,10 @@ LOCAL_PATH := $(call my-dir)
 swiftshader_root := $(LOCAL_PATH)
 
 # LLVM version for SwiftShader
-SWIFTSHADER_LLVM_VERSION ?= 3
+REACTOR_LLVM_VERSION ?= 3
 
 
-ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
+ifeq ($(REACTOR_LLVM_VERSION),3)
 # Reactor with LLVM 3.0 doesn't support ARM.  Use Subzero as the Reactor JIT
 # back-end on ARM.
 ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
@@ -35,7 +35,7 @@ ifdef SWIFTSHADER_USE_SUBZERO
 swiftshader_requires_cxx11 := true
 endif
 
-ifeq ($(SWIFTSHADER_LLVM_VERSION),7)
+ifeq ($(REACTOR_LLVM_VERSION),7)
 swiftshader_requires_cxx11 := true
 endif
 
@@ -48,13 +48,13 @@ endif
 
 
 # Check whether $(TARGET_ARCH) is supported.
-ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
+ifeq ($(REACTOR_LLVM_VERSION),3)
 ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm))
 swiftshader_unsupported_build := true
 endif
 endif
 
-ifeq ($(SWIFTSHADER_LLVM_VERSION),7)
+ifeq ($(REACTOR_LLVM_VERSION),7)
 ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 arm arm64))
 swiftshader_unsupported_build := true
 endif
@@ -64,7 +64,7 @@ endif
 ifneq ($(swiftshader_unsupported_build),true)
 include $(swiftshader_root)/src/Android.mk
 include $(swiftshader_root)/tests/unittests/Android.mk
-ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
+ifeq ($(REACTOR_LLVM_VERSION),3)
 include $(swiftshader_root)/third_party/LLVM/Android.mk
 else
 include $(swiftshader_root)/third_party/llvm-7.0/Android.mk

CMakeLists.txt

@@ -73,7 +73,7 @@ endif()
 set(REACTOR_BACKEND DEFAULT_REACTOR_BACKEND CACHE STRING "JIT compiler back-end used by Reactor")
 set_property(CACHE REACTOR_BACKEND PROPERTY STRINGS LLVM Subzero)
 
-set(SWIFTSHADER_LLVM_VERSION "3" CACHE STRING "LLVM version used by Reactor")
+set(REACTOR_LLVM_VERSION "3" CACHE STRING "LLVM version used by Reactor")
 
 # LLVM disallows calling cmake . from the main LLVM dir, the reason is that
 # it builds header files that could overwrite the orignal ones. Here we
@@ -163,7 +163,7 @@ set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/src)
 set(OPENGL_DIR ${SOURCE_DIR}/OpenGL)
 set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler)
 set(VULKAN_DIR ${SOURCE_DIR}/Vulkan)
-if(SWIFTSHADER_LLVM_VERSION EQUAL 3)
+if(REACTOR_LLVM_VERSION EQUAL 3)
     set(LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/LLVM)
 else()
     set(LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/llvm-7.0/llvm)
@@ -265,9 +265,9 @@ endif()
 # LLVM
 ###########################################################
 
-add_definitions(-DSWIFTSHADER_LLVM_VERSION=${SWIFTSHADER_LLVM_VERSION})
+add_definitions(-DREACTOR_LLVM_VERSION=${REACTOR_LLVM_VERSION})
 
-if(SWIFTSHADER_LLVM_VERSION EQUAL 3)
+if(REACTOR_LLVM_VERSION EQUAL 3)
 
 set(LLVM_LIST
     ${LLVM_DIR}/lib/Analysis/AliasAnalysis.cpp
@@ -633,7 +633,7 @@ list(APPEND LLVM_INCLUDE_DIR
     ${LLVM_DIR}/lib/Target/X86
 )
 
-elseif(SWIFTSHADER_LLVM_VERSION EQUAL 7)
+elseif(REACTOR_LLVM_VERSION EQUAL 7)
 
 set(LLVM_LIST
     ${LLVM_DIR}/lib/Analysis/AliasAnalysis.cpp
@@ -1637,7 +1637,7 @@ list(APPEND LLVM_INCLUDE_DIR
     ${LLVM_CONFIG_DIR}/common/lib/Transforms/InstCombine
 )
 
-endif()  # SWIFTSHADER_LLVM_VERSION
+endif()  # REACTOR_LLVM_VERSION
 
 add_library(llvm STATIC ${LLVM_LIST})
 set_target_properties(llvm PROPERTIES

src/Android.mk

@@ -17,7 +17,7 @@ COMMON_C_INCLUDES += \
 
 else
 
-ifeq ($(SWIFTSHADER_LLVM_VERSION),3)
+ifeq ($(REACTOR_LLVM_VERSION),3)
 COMMON_C_INCLUDES += \
 	$(LOCAL_PATH)/../third_party/LLVM/include
 else
@@ -156,7 +156,7 @@ COMMON_C_INCLUDES += \
 endif
 
 # Common LLVM defines
-COMMON_CFLAGS += -DSWIFTSHADER_LLVM_VERSION=$(SWIFTSHADER_LLVM_VERSION)
+COMMON_CFLAGS += -DREACTOR_LLVM_VERSION=$(REACTOR_LLVM_VERSION)
 
 # Common Subzero defines
 COMMON_CFLAGS += -DALLOW_DUMP=0 -DALLOW_TIMERS=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_MINIMAL_BUILD=0 -DALLOW_WASM=0 -DICE_THREAD_LOCAL_HACK=1

src/Reactor/LLVMRoutine.cpp

@@ -19,7 +19,7 @@
 
 namespace rr
 {
-#if SWIFTSHADER_LLVM_VERSION < 7
+#if REACTOR_LLVM_VERSION < 7
 	LLVMRoutine::LLVMRoutine(int bufferSize) : bufferSize(bufferSize)
 	{
 		void *memory = allocateExecutable(bufferSize);

src/Reactor/LLVMRoutine.hpp

@@ -21,7 +21,7 @@
 
 namespace rr
 {
-#if SWIFTSHADER_LLVM_VERSION < 7
+#if REACTOR_LLVM_VERSION < 7
 	class LLVMRoutineManager;
 
 	class LLVMRoutine : public Routine
@@ -76,7 +76,7 @@ namespace rr
 		LLVMReactorJIT *reactorJIT;
 		uint64_t moduleKey;
 	};
-#endif  // SWIFTSHADER_LLVM_VERSION < 7
+#endif  // REACTOR_LLVM_VERSION < 7
 }
 
 #endif   // rr_LLVMRoutine_hpp

src/Reactor/LLVMRoutineManager.cpp

@@ -14,7 +14,7 @@
 
 #include "LLVMRoutineManager.hpp"
 
-#if SWIFTSHADER_LLVM_VERSION < 7
+#if REACTOR_LLVM_VERSION < 7
 
 #include "LLVMRoutine.hpp"
 #include "llvm/Function.h"
@@ -149,4 +149,4 @@ namespace rr
 	}
 }
 
-#endif  // SWIFTSHADER_LLVM_VERSION < 7
+#endif  // REACTOR_LLVM_VERSION < 7

src/Reactor/LLVMRoutineManager.hpp

@@ -15,7 +15,7 @@
 #ifndef rr_LLVMRoutineManager_hpp
 #define rr_LLVMRoutineManager_hpp
 
-#if SWIFTSHADER_LLVM_VERSION < 7
+#if REACTOR_LLVM_VERSION < 7
 
 #include "llvm/ExecutionEngine/JITMemoryManager.h"
 #include "llvm/GlobalValue.h"
@@ -56,6 +56,6 @@ namespace rr
 	};
 }
 
-#endif  // SWIFTSHADER_LLVM_VERSION < 7
+#endif  // REACTOR_LLVM_VERSION < 7
 
 #endif   // rr_LLVMRoutineManager_hpp