Skip to content

S
swiftshader
Commit b138adb7 by Ben Clayton
Options

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/+/43012Tested-by: 's avatarBen Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 37457d5e
Showing with 385 additions and 3 deletions
tests/kokoro/gcp_ubuntu/continuous.sh
...@@ -20,10 +20,20 @@ if [[ -z "${REACTOR_BACKEND}" ]]; then ...@@ -20,10 +20,20 @@ if [[ -z "${REACTOR_BACKEND}" ]]; then
REACTOR_BACKEND="LLVM" REACTOR_BACKEND="LLVM"
fi 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. # Lower the amount of debug info, to reduce Kokoro build times.
LESS_DEBUG_INFO=1 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) cmake --build . -- -j $(nproc)
# Run unit tests # Run unit tests
......
tests/kokoro/gcp_ubuntu/reactor_llvm/debug/continuous.cfg → tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/debug/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/gcp_ubuntu/reactor_llvm/debug/presubmit.cfg → tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/debug/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg → tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/release/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/gcp_ubuntu/reactor_llvm/release/presubmit.cfg → tests/kokoro/gcp_ubuntu/reactor_llvm/10.0/release/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/continuous.cfg 0 → 100644
# Format: //devtools/kokoro/config/proto/build.proto
# Location of the continuous bash script in Git.
build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
env_vars {
key: "REACTOR_BACKEND"
value: "LLVM"
}
env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/debug/presubmit.cfg 0 → 100644
# Format: //devtools/kokoro/config/proto/build.proto
# Location of the continuous bash script in Git.
build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
env_vars {
key: "REACTOR_BACKEND"
value: "LLVM"
}
env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/continuous.cfg 0 → 100644
# Format: //devtools/kokoro/config/proto/build.proto
# Location of the continuous bash script in Git.
build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
env_vars {
key: "REACTOR_BACKEND"
value: "LLVM"
}
env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
tests/kokoro/gcp_ubuntu/reactor_llvm/7.0/release/presubmit.cfg 0 → 100644
# Format: //devtools/kokoro/config/proto/build.proto
# Location of the continuous bash script in Git.
build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
env_vars {
key: "REACTOR_BACKEND"
value: "LLVM"
}
env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
tests/kokoro/gcp_ubuntu/reactor_subzero/debug/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/gcp_ubuntu/reactor_subzero/debug/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/gcp_windows/continuous.bat
...@@ -8,6 +8,12 @@ set SRC=%cd%\git\SwiftShader ...@@ -8,6 +8,12 @@ set SRC=%cd%\git\SwiftShader
cd %SRC% cd %SRC%
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL! 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 git submodule update --init
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
...@@ -17,7 +23,14 @@ SET LESS_DEBUG_INFO=1 ...@@ -17,7 +23,14 @@ SET LESS_DEBUG_INFO=1
cd %SRC%\build cd %SRC%\build
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL! 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! if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
cmake --build . cmake --build .
......
tests/kokoro/gcp_windows/reactor_llvm/debug/continuous.cfg → tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/gcp_windows/reactor_llvm/debug/presubmit.cfg → tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg → tests/kokoro/gcp_windows/reactor_llvm/10.0/release/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/gcp_windows/reactor_llvm/release/presubmit.cfg → tests/kokoro/gcp_windows/reactor_llvm/10.0/release/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/continuous.cfg 0 → 100644
# 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: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
tests/kokoro/gcp_windows/reactor_llvm/7.0/debug/presubmit.cfg 0 → 100644
# 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: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
tests/kokoro/gcp_windows/reactor_llvm/7.0/release/continuous.cfg 0 → 100644
# 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: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
tests/kokoro/gcp_windows/reactor_llvm/7.0/release/presubmit.cfg 0 → 100644
# 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: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/macos/continuous.sh
...@@ -15,6 +15,11 @@ if [[ -z "${REACTOR_BACKEND}" ]]; then ...@@ -15,6 +15,11 @@ if [[ -z "${REACTOR_BACKEND}" ]]; then
REACTOR_BACKEND="LLVM" REACTOR_BACKEND="LLVM"
fi 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. # Lower the amount of debug info, to reduce Kokoro build times.
LESS_DEBUG_INFO=1 LESS_DEBUG_INFO=1
...@@ -25,7 +30,13 @@ if [[ "${BUILD_TYPE}" == "Debug" ]]; then ...@@ -25,7 +30,13 @@ if [[ "${BUILD_TYPE}" == "Debug" ]]; then
ASAN="OFF" ASAN="OFF"
fi 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) cmake --build . -- -j$(sysctl -n hw.logicalcpu)
# Run unit tests # Run unit tests
......
tests/kokoro/macos/reactor_llvm/debug/continuous.cfg → tests/kokoro/macos/reactor_llvm/10.0/debug/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/macos/reactor_llvm/debug/presubmit.cfg → tests/kokoro/macos/reactor_llvm/10.0/debug/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/macos/reactor_llvm/release/continuous.cfg → tests/kokoro/macos/reactor_llvm/10.0/release/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/macos/reactor_llvm/release/presubmit.cfg → tests/kokoro/macos/reactor_llvm/10.0/release/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "10.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/macos/reactor_llvm/7.0/debug/continuous.cfg 0 → 100644
# 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: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
tests/kokoro/macos/reactor_llvm/7.0/debug/presubmit.cfg 0 → 100644
# 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: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "Debug"
}
tests/kokoro/macos/reactor_llvm/7.0/release/continuous.cfg 0 → 100644
# 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: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
tests/kokoro/macos/reactor_llvm/7.0/release/presubmit.cfg 0 → 100644
# 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: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
tests/kokoro/macos/reactor_subzero/debug/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/macos/reactor_subzero/debug/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "Debug" value: "Debug"
} }
tests/kokoro/macos/reactor_subzero/release/continuous.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
...@@ -9,6 +9,11 @@ env_vars { ...@@ -9,6 +9,11 @@ env_vars {
} }
env_vars { env_vars {
key: "LLVM_VERSION"
value: "7.0"
}
env_vars {
key: "BUILD_TYPE" key: "BUILD_TYPE"
value: "RelWithDebInfo" value: "RelWithDebInfo"
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment