Kokoro: Move llvm configs into 7.0 subdirectory, create 10.0 copies.
And add the LLVM_VERSION env var and plumb this into the shell scripts.
Stub building the 10.0 builds for now. We'll enable them one at a time.
Bug: b/152339534
Change-Id: I645a6d748dec956505ba550ce96ff85a21f9f73e
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43012
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
diff --git a/tests/kokoro/gcp_ubuntu/continuous.sh b/tests/kokoro/gcp_ubuntu/continuous.sh
index 6dc5655..f3a544e 100755
--- a/tests/kokoro/gcp_ubuntu/continuous.sh
+++ b/tests/kokoro/gcp_ubuntu/continuous.sh
@@ -20,10 +20,20 @@
REACTOR_BACKEND="LLVM"
fi
+if [[ "${LLVM_VERSION}" == "10.0" ]]; then
+ echo "TODO(b/152339534): LLVM 10 migration is still in progress"
+ exit 0
+fi
+
# Lower the amount of debug info, to reduce Kokoro build times.
LESS_DEBUG_INFO=1
-cmake .. "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DREACTOR_VERIFY_LLVM_IR=1" "-DLESS_DEBUG_INFO=${LESS_DEBUG_INFO}"
+cmake .. \
+ "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" \
+ "-DREACTOR_BACKEND=${REACTOR_BACKEND}" \
+ "-DSWIFTSHADER_LLVM_VERSION=${LLVM_VERSION}" \
+ "-DREACTOR_VERIFY_LLVM_IR=1" \
+ "-DLESS_DEBUG_INFO=${LESS_DEBUG_INFO}"
cmake --build . -- -j $(nproc)
# Run unit tests
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/debug/continuous.cfg
similarity index 83%
copy from tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg
copy to tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/debug/continuous.cfg
index a4e64a9..a9e3edb 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/debug/presubmit.cfg
similarity index 83%
copy from tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg
copy to tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/debug/presubmit.cfg
index a4e64a9..a9e3edb 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/release/continuous.cfg
similarity index 84%
rename from tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg
rename to tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/release/continuous.cfg
index a12e96e..252b181 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/presubmit.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/release/presubmit.cfg
similarity index 84%
rename from tests/kokoro/gcp_ubuntu/reactor_llvm/release/presubmit.cfg
rename to tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/release/presubmit.cfg
index a12e96e..252b181 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/continuous.cfg
similarity index 84%
rename from tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg
rename to tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/continuous.cfg
index a4e64a9..4a815b2 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/debug/presubmit.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/presubmit.cfg
similarity index 84%
rename from tests/kokoro/gcp_ubuntu/reactor_llvm/debug/presubmit.cfg
rename to tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/presubmit.cfg
index a4e64a9..4a815b2 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/debug/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/continuous.cfg
similarity index 84%
copy from tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg
copy to tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/continuous.cfg
index a12e96e..a531867 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/presubmit.cfg
similarity index 84%
copy from tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg
copy to tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/presubmit.cfg
index a12e96e..a531867 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg
index bab15ae..7dcdf0b 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg b/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg
index bab15ae..7dcdf0b 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
index 6190da8..31a9a84 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
index 6190da8..31a9a84 100644
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_windows/continuous.bat b/tests/kokoro/gcp_windows/continuous.bat
index ecc238f..d342ada 100644
--- a/tests/kokoro/gcp_windows/continuous.bat
+++ b/tests/kokoro/gcp_windows/continuous.bat
@@ -8,6 +8,12 @@
cd %SRC%
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+
+IF "%LLVM_VERSION%"=="10.0" (
+ ECHO "TODO(b/152339534): LLVM 10 migration is still in progress"
+ EXIT 0
+)
+
git submodule update --init
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
@@ -17,7 +23,14 @@
cd %SRC%\build
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-cmake .. -G "Visual Studio 15 2017 Win64" -Thost=x64 "-DCMAKE_BUILD_TYPE=%BUILD_TYPE%" "-DREACTOR_BACKEND=%REACTOR_BACKEND%" "-DREACTOR_VERIFY_LLVM_IR=1" "-DLESS_DEBUG_INFO=%LESS_DEBUG_INFO%"
+cmake .. ^
+ -G "Visual Studio 15 2017 Win64" ^
+ -Thost=x64 ^
+ "-DCMAKE_BUILD_TYPE=%BUILD_TYPE%" ^
+ "-DREACTOR_BACKEND=%REACTOR_BACKEND%" ^
+ "-DSWIFTSHADER_LLVM_VERSION=%LLVM_VERSION%" ^
+ "-DREACTOR_VERIFY_LLVM_IR=1" ^
+ "-DLESS_DEBUG_INFO=%LESS_DEBUG_INFO%"
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
cmake --build .
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/continuous.cfg
similarity index 83%
copy from tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg
copy to tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/continuous.cfg
index c21558f..dcfdd80 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/presubmit.cfg
similarity index 83%
copy from tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg
copy to tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/presubmit.cfg
index c21558f..dcfdd80 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/continuous.cfg
similarity index 84%
rename from tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg
rename to tests/kokoro/gcp_windows/reactor_llvm/10.0/release/continuous.cfg
index 1e74f2e..3302963 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/release/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/presubmit.cfg
similarity index 84%
rename from tests/kokoro/gcp_windows/reactor_llvm/release/presubmit.cfg
rename to tests/kokoro/gcp_windows/reactor_llvm/10.0/release/presubmit.cfg
index 1e74f2e..3302963 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/release/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/continuous.cfg
similarity index 83%
rename from tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg
rename to tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/continuous.cfg
index c21558f..afb708c 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/presubmit.cfg
similarity index 83%
copy from tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg
copy to tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/presubmit.cfg
index c21558f..afb708c 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/continuous.cfg
similarity index 84%
copy from tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg
copy to tests/kokoro/gcp_windows/reactor_llvm/7.0/release/continuous.cfg
index 1e74f2e..da81a84 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/presubmit.cfg
similarity index 84%
copy from tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg
copy to tests/kokoro/gcp_windows/reactor_llvm/7.0/release/presubmit.cfg
index 1e74f2e..da81a84 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/7.0/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/debug/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_llvm/debug/presubmit.cfg
deleted file mode 100644
index c21558f..0000000
--- a/tests/kokoro/gcp_windows/reactor_llvm/debug/presubmit.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous script in Git.
-build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "Debug"
-}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
index f29e096..c620364 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
index f29e096..c620364 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
index 27403ed..16a78de 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
index 27403ed..16a78de 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/macos/continuous.sh b/tests/kokoro/macos/continuous.sh
index c99beed..6887369 100755
--- a/tests/kokoro/macos/continuous.sh
+++ b/tests/kokoro/macos/continuous.sh
@@ -15,6 +15,11 @@
REACTOR_BACKEND="LLVM"
fi
+if [[ "${LLVM_VERSION}" == "10.0" ]]; then
+ echo "TODO(b/152339534): LLVM 10 migration is still in progress"
+ exit 0
+fi
+
# Lower the amount of debug info, to reduce Kokoro build times.
LESS_DEBUG_INFO=1
@@ -25,7 +30,13 @@
ASAN="OFF"
fi
-cmake .. "-DSWIFTSHADER_ASAN=${ASAN}" "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DREACTOR_VERIFY_LLVM_IR=1" "-DLESS_DEBUG_INFO=${LESS_DEBUG_INFO}"
+cmake .. \
+ "-DSWIFTSHADER_ASAN=${ASAN}" \
+ "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" \
+ "-DREACTOR_BACKEND=${REACTOR_BACKEND}" \
+ "-DSWIFTSHADER_LLVM_VERSION=${LLVM_VERSION}" \
+ "-DREACTOR_VERIFY_LLVM_IR=1" \
+ "-DLESS_DEBUG_INFO=${LESS_DEBUG_INFO}"
cmake --build . -- -j$(sysctl -n hw.logicalcpu)
# Run unit tests
diff --git a/tests/kokoro/macos/reactor_llvm/debug/continuous.cfg b/tests/kokoro/macos/reactor_llvm/10.0/debug/continuous.cfg
similarity index 83%
copy from tests/kokoro/macos/reactor_llvm/debug/continuous.cfg
copy to tests/kokoro/macos/reactor_llvm/10.0/debug/continuous.cfg
index 941d08d..9815817 100644
--- a/tests/kokoro/macos/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/macos/reactor_llvm/10.0/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/macos/reactor_llvm/debug/continuous.cfg b/tests/kokoro/macos/reactor_llvm/10.0/debug/presubmit.cfg
similarity index 83%
copy from tests/kokoro/macos/reactor_llvm/debug/continuous.cfg
copy to tests/kokoro/macos/reactor_llvm/10.0/debug/presubmit.cfg
index 941d08d..9815817 100644
--- a/tests/kokoro/macos/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/macos/reactor_llvm/10.0/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/macos/reactor_llvm/release/continuous.cfg b/tests/kokoro/macos/reactor_llvm/10.0/release/continuous.cfg
similarity index 84%
rename from tests/kokoro/macos/reactor_llvm/release/continuous.cfg
rename to tests/kokoro/macos/reactor_llvm/10.0/release/continuous.cfg
index 02e6206..3b33aab 100644
--- a/tests/kokoro/macos/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/macos/reactor_llvm/10.0/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/macos/reactor_llvm/release/presubmit.cfg b/tests/kokoro/macos/reactor_llvm/10.0/release/presubmit.cfg
similarity index 84%
rename from tests/kokoro/macos/reactor_llvm/release/presubmit.cfg
rename to tests/kokoro/macos/reactor_llvm/10.0/release/presubmit.cfg
index 02e6206..3b33aab 100644
--- a/tests/kokoro/macos/reactor_llvm/release/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_llvm/10.0/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/macos/reactor_llvm/debug/continuous.cfg b/tests/kokoro/macos/reactor_llvm/7.0/debug/continuous.cfg
similarity index 83%
rename from tests/kokoro/macos/reactor_llvm/debug/continuous.cfg
rename to tests/kokoro/macos/reactor_llvm/7.0/debug/continuous.cfg
index 941d08d..107e32f 100644
--- a/tests/kokoro/macos/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/macos/reactor_llvm/7.0/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/macos/reactor_llvm/debug/continuous.cfg b/tests/kokoro/macos/reactor_llvm/7.0/debug/presubmit.cfg
similarity index 83%
copy from tests/kokoro/macos/reactor_llvm/debug/continuous.cfg
copy to tests/kokoro/macos/reactor_llvm/7.0/debug/presubmit.cfg
index 941d08d..107e32f 100644
--- a/tests/kokoro/macos/reactor_llvm/debug/continuous.cfg
+++ b/tests/kokoro/macos/reactor_llvm/7.0/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/macos/reactor_llvm/release/continuous.cfg b/tests/kokoro/macos/reactor_llvm/7.0/release/continuous.cfg
similarity index 84%
copy from tests/kokoro/macos/reactor_llvm/release/continuous.cfg
copy to tests/kokoro/macos/reactor_llvm/7.0/release/continuous.cfg
index 02e6206..e39c5c1 100644
--- a/tests/kokoro/macos/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/macos/reactor_llvm/7.0/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/macos/reactor_llvm/release/presubmit.cfg b/tests/kokoro/macos/reactor_llvm/7.0/release/presubmit.cfg
similarity index 84%
copy from tests/kokoro/macos/reactor_llvm/release/presubmit.cfg
copy to tests/kokoro/macos/reactor_llvm/7.0/release/presubmit.cfg
index 02e6206..e39c5c1 100644
--- a/tests/kokoro/macos/reactor_llvm/release/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_llvm/7.0/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/macos/reactor_llvm/debug/presubmit.cfg b/tests/kokoro/macos/reactor_llvm/debug/presubmit.cfg
deleted file mode 100644
index 941d08d..0000000
--- a/tests/kokoro/macos/reactor_llvm/debug/presubmit.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Location of the continuous bash script in Git.
-build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
-
-env_vars {
- key: "REACTOR_BACKEND"
- value: "LLVM"
-}
-
-env_vars {
- key: "BUILD_TYPE"
- value: "Debug"
-}
diff --git a/tests/kokoro/macos/reactor_subzero/debug/continuous.cfg b/tests/kokoro/macos/reactor_subzero/debug/continuous.cfg
index ccfab85..ff20925 100644
--- a/tests/kokoro/macos/reactor_subzero/debug/continuous.cfg
+++ b/tests/kokoro/macos/reactor_subzero/debug/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg b/tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg
index ccfab85..ff20925 100644
--- a/tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
diff --git a/tests/kokoro/macos/reactor_subzero/release/continuous.cfg b/tests/kokoro/macos/reactor_subzero/release/continuous.cfg
index 5575aa7..057bc20 100644
--- a/tests/kokoro/macos/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/macos/reactor_subzero/release/continuous.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
diff --git a/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg b/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
index 5575aa7..057bc20 100644
--- a/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
@@ -9,6 +9,11 @@
}
env_vars {
+ key: "LLVM_VERSION"
+ value: "7.0"
+}
+
+env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
