Skip to content

S
swiftshader
Commit 21f81124 by Nicolas Capens Committed by Nicolas Capens
Options

Regres: Use 'default' dEQP target and skip GLES daily tests

Using -DDEQP_TARGET=x11_egl caused a build error on some systems: /usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o: in function `_start': (.text+0x20): undefined reference to `main' Using 'default' instead makes the build succeed, and makes XCB WSI tests pass. However, GLES tests crash. Since we no longer need them due to SwANGLE, with SwiftShader becoming Vulkan-only, this change removes them from the test run. Also, the dEQP build is reduced to just the deqp-vk target. Lastly, code coverage generation on 'daily' test runs is disabled. It produced errors such as: Failed to process test coverage for test 'dEQP-VK.***'. llvm-profdata errored. Cause: exit status 1 It was already disabled locally on the Regres bot to avoid these errors. Bug: b/189469951 Bug: b/152192800 Change-Id: I07383e1168cc322bb9247ed39db091f91c054b6d Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/54589 Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 21c3054a
Showing with 7 additions and 7 deletions
tests/regres/cmd/regres/main.go
...@@ -516,13 +516,15 @@ func (r *regres) getOrBuildDEQP(test *test) (deqpBuild, error) { ...@@ -516,13 +516,15 @@ func (r *regres) getOrBuildDEQP(test *test) (deqpBuild, error) {
} }
if err := shell.Shell(buildTimeout, r.cmake, buildDir, if err := shell.Shell(buildTimeout, r.cmake, buildDir,
"-DDEQP_TARGET=x11_egl", "-DDEQP_TARGET=default",
"-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_BUILD_TYPE=Release",
".."); err != nil { ".."); err != nil {
return deqpBuild{}, cause.Wrap(err, "Couldn't generate build rules for deqp %v @ %v", cfg.Remote, cfg.SHA) return deqpBuild{}, cause.Wrap(err, "Couldn't generate build rules for deqp %v @ %v", cfg.Remote, cfg.SHA)
} }
if err := shell.Shell(buildTimeout, r.make, buildDir, fmt.Sprintf("-j%d", runtime.NumCPU())); err != nil { if err := shell.Shell(buildTimeout, r.make, buildDir,
fmt.Sprintf("-j%d", runtime.NumCPU()),
"deqp-vk"); err != nil {
return deqpBuild{}, cause.Wrap(err, "Couldn't build deqp %v @ %v", cfg.Remote, cfg.SHA) return deqpBuild{}, cause.Wrap(err, "Couldn't build deqp %v @ %v", cfg.Remote, cfg.SHA)
} }
...@@ -616,6 +618,9 @@ func (r *regres) testParent(change *changeInfo, testlists testlist.Lists, d deqp ...@@ -616,6 +618,9 @@ func (r *regres) testParent(change *changeInfo, testlists testlist.Lists, d deqp
// information will be generated for the run, and commiteed to the // information will be generated for the run, and commiteed to the
// coverageBranch. // coverageBranch.
func (r *regres) runDaily(client *gerrit.Client, reactorBackend reactorBackend, genCov bool) error { func (r *regres) runDaily(client *gerrit.Client, reactorBackend reactorBackend, genCov bool) error {
// TODO(b/152192800): Generating coverage data is currently broken.
genCov = false
log.Printf("Updating test lists (Backend: %v)\n", reactorBackend) log.Printf("Updating test lists (Backend: %v)\n", reactorBackend)
if genCov { if genCov {
......
tests/regres/full-tests.json
[ [
{ "name": "gles2-master", "api": "gles2", "tests": "testlists/gles2-master.txt" },
{ "name": "gles3-565-no-depth-no-stencil", "api": "gles3", "tests": "testlists/gles3-565-no-depth-no-stencil.txt" },
{ "name": "gles3-master", "api": "gles3", "tests": "testlists/gles3-master.txt" },
{ "name": "vulkan-wsi", "api": "vulkan", "tests": "testlists/vk-wsi.txt" }, { "name": "vulkan-wsi", "api": "vulkan", "tests": "testlists/vk-wsi.txt" },
{ "name": "vulkan-master", "api": "vulkan", "tests": "testlists/vk-master.txt" } { "name": "vulkan-master", "api": "vulkan", "tests": "testlists/vk-master.txt" }
] ]
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