Put LLVM IR verification behind a default-disabled flag

.vscode/c_cpp_properties.json

@@ -3,7 +3,8 @@
         {
             "name": "Linux",
             "defines": [
-                "ENABLE_RR_DEBUG_INFO=1"
+                "ENABLE_RR_DEBUG_INFO=1",
+                "VERIFY_LLVM_IR=1"
             ],
             "includePath": [
                 "${workspaceFolder}/src",
@@ -19,7 +20,8 @@
         {
             "name": "Mac",
             "defines": [
-                "ENABLE_RR_DEBUG_INFO=1"
+                "ENABLE_RR_DEBUG_INFO=1",
+                "VERIFY_LLVM_IR=1"
             ],
             "includePath": [
                 "${workspaceFolder}/src",
@@ -35,7 +37,8 @@
         {
             "name": "Win32",
             "defines": [
-                "ENABLE_RR_DEBUG_INFO=1"
+                "ENABLE_RR_DEBUG_INFO=1",
+                "VERIFY_LLVM_IR=1"
             ],
             "includePath": [
                 "${workspaceFolder}/src",

.vscode/tasks.json

@@ -69,7 +69,8 @@
                 "-GNinja",
                 "-DCMAKE_BUILD_TYPE=${input:buildType}",
                 "-DWARNINGS_AS_ERRORS=1",
-                "-DDCHECK_ALWAYS_ON=1"
+                "-DDCHECK_ALWAYS_ON=1",
+                "-DREACTOR_VERIFY_LLVM_IR=1",
             ],
             "options": {
                 "cwd": "${workspaceRoot}/build"

CMakeLists.txt

@@ -89,6 +89,7 @@ option(WARNINGS_AS_ERRORS "Treat all warnings as errors" 1)
 option(DCHECK_ALWAYS_ON "Check validation macros even in release builds" 0)
 option(REACTOR_EMIT_DEBUG_INFO "Emit debug info for JIT functions" 0)
 option(REACTOR_EMIT_PRINT_LOCATION "Emit printing of location info for JIT functions" 0)
+option(REACTOR_VERIFY_LLVM_IR "Check reactor-generated LLVM IR is valid even in release builds" 0)
 
 if(ARCH STREQUAL "arm")
     set(DEFAULT_REACTOR_BACKEND "Subzero")
@@ -464,6 +465,10 @@ if(REACTOR_EMIT_DEBUG_INFO)
     list(APPEND SWIFTSHADER_COMPILE_OPTIONS "-DENABLE_RR_DEBUG_INFO")
 endif()
 
+if(REACTOR_VERIFY_LLVM_IR)
+    list(APPEND SWIFTSHADER_COMPILE_OPTIONS "-DENABLE_RR_LLVM_IR_VERIFICATION")
+endif()
+
 if(WIN32)
     add_definitions(-DWINVER=0x501 -DNOMINMAX -DSTRICT)
     set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} "" "lib")

src/Reactor/LLVMReactor.cpp

@@ -1051,14 +1051,13 @@ namespace rr
 			::module->print(file, 0);
 		}
 
-		// FIXME: Disable for release builds once heavy development is over.
-		bool verifyIR = true;
-		if(verifyIR)
+#if defined(ENABLE_RR_LLVM_IR_VERIFICATION) || !defined(NDEBUG)
 		{
 			llvm::legacy::PassManager pm;
 			pm.add(llvm::createVerifierPass());
 			pm.run(*::module);
 		}
+#endif // defined(ENABLE_RR_LLVM_IR_VERIFICATION) || !defined(NDEBUG)
 
 		if(runOptimizations)
 		{

tests/kokoro/gcp_ubuntu/continuous.sh

@@ -15,7 +15,7 @@ if [[ -z "${REACTOR_BACKEND}" ]]; then
   REACTOR_BACKEND="LLVM"
 fi
 
-cmake .. "-DREACTOR_BACKEND=${REACTOR_BACKEND}"
+cmake .. "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DREACTOR_VERIFY_LLVM_IR=1"
 make --jobs=$(nproc)
 
 # Run the reactor unit tests.

tests/kokoro/gcp_windows/continuous.bat

@@ -17,7 +17,7 @@ SET CONFIG=Debug
 cd %SRC%\build
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
 
-cmake .. -G "Visual Studio 15 2017 Win64" -Thost=x64 "-DREACTOR_BACKEND=%REACTOR_BACKEND%"
+cmake .. -G "Visual Studio 15 2017 Win64" -Thost=x64 "-DREACTOR_BACKEND=%REACTOR_BACKEND%" "-DREACTOR_VERIFY_LLVM_IR=1"
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
 
 %MSBUILD% /p:Configuration=%CONFIG% SwiftShader.sln

tests/kokoro/macos/continuous.sh

@@ -15,7 +15,7 @@ if [[ -z "${REACTOR_BACKEND}" ]]; then
   REACTOR_BACKEND="LLVM"
 fi
 
-cmake .. "-DASAN=ON -DREACTOR_BACKEND=${REACTOR_BACKEND} -DCMAKE_BUILD_TYPE=RelWithDebInfo"
+cmake .. "-DASAN=ON -DREACTOR_BACKEND=${REACTOR_BACKEND} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DREACTOR_VERIFY_LLVM_IR=1"
 make -j$(sysctl -n hw.logicalcpu)
 
 # Run the reactor unit tests.

tests/regres/main.go

@@ -720,6 +720,7 @@ func (t *test) build() error {
 	if err := shell.Shell(buildTimeout, t.r.cmake, t.buildDir,
 		"-DCMAKE_BUILD_TYPE=Release",
 		"-DDCHECK_ALWAYS_ON=1",
+		"-DREACTOR_VERIFY_LLVM_IR=1",
 		".."); err != nil {
 		return err
 	}