regres: add daily run against SwiftShader/Subzero
The regres daily run will now first build and run SwiftShader/Subzero,
followed by SwiftShader/LLVM, both uploading to the same CL. This allows
us to see if there are any diffs between the two, and we can still merge
the latest LLVM version.
* Also added -dailyonly to run the daily only and quit.
* Also added -limit to limit the number of tests that are run for testing.
Bug: b/152216043
Change-Id: I5923695d39316a43f867ee0e82fb33f65a66607e
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/42808
Tested-by: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/tests/regres/cmd/regres/main.go b/tests/regres/cmd/regres/main.go
index 5b85e28..0766fc5 100644
--- a/tests/regres/cmd/regres/main.go
+++ b/tests/regres/cmd/regres/main.go
@@ -79,8 +79,10 @@
dryRun = flag.Bool("dry", false, "don't post regres reports to gerrit")
maxProcMemory = flag.Uint64("max-proc-mem", shell.MaxProcMemory, "maximum virtual memory per child process")
dailyNow = flag.Bool("dailynow", false, "Start by running the daily pass")
+ dailyOnly = flag.Bool("dailyonly", false, "Run only the daily pass")
dailyChange = flag.String("dailychange", "", "Change hash to use for daily pass, HEAD if not provided")
priority = flag.String("priority", "", "Prioritize a single change with the given id")
+ limit = flag.Int("limit", 0, "only run a maximum of this number of tests")
)
func main() {
@@ -97,6 +99,7 @@
keepCheckouts: *keepCheckouts,
dryRun: *dryRun,
dailyNow: *dailyNow,
+ dailyOnly: *dailyOnly,
dailyChange: *dailyChange,
priority: *priority,
}
@@ -119,6 +122,7 @@
dryRun bool // don't post any reviews
maxProcMemory uint64 // max virtual memory for child processes
dailyNow bool // start with a daily run
+ dailyOnly bool // run only the daily run
dailyChange string // Change hash to use for daily pass, HEAD if not provided
priority string // Prioritize a single change with the given id
}
@@ -200,16 +204,24 @@
lastUpdatedTestLists := toDate(time.Now())
lastQueriedChanges := time.Time{}
- if r.dailyNow {
+ if r.dailyNow || r.dailyOnly {
lastUpdatedTestLists = date{}
}
for {
if now := time.Now(); toDate(now) != lastUpdatedTestLists && now.Hour() >= dailyUpdateTestListHour {
lastUpdatedTestLists = toDate(now)
- if err := r.updateTestLists(client); err != nil {
+ if err := r.updateTestLists(client, subzero); err != nil {
log.Println(err.Error())
}
+ if err := r.updateTestLists(client, llvm); err != nil {
+ log.Println(err.Error())
+ }
+ }
+
+ if r.dailyOnly {
+ log.Println("Daily finished with --dailyonly. Stopping")
+ return nil
}
// Update list of tracked changes.
@@ -508,8 +520,8 @@
return results, nil
}
-func (r *regres) updateTestLists(client *gerrit.Client) error {
- log.Println("Updating test lists")
+func (r *regres) updateTestLists(client *gerrit.Client, reactorBackend reactorBackend) error {
+ log.Printf("Updating test lists (reactorBackend: %v)\n", reactorBackend)
dailyHash := git.Hash{}
if r.dailyChange == "" {
@@ -523,7 +535,7 @@
}
// Get the full test results.
- test := r.newTest(dailyHash)
+ test := r.newTest(dailyHash).setReactorBackend(reactorBackend)
defer test.cleanup()
// Always need to checkout the change.
@@ -575,6 +587,7 @@
commitMsg := strings.Builder{}
commitMsg.WriteString(consts.TestListUpdateCommitSubjectPrefix + dailyHash.String()[:8])
+ commitMsg.WriteString("\n\nReactor backend: " + string(reactorBackend))
if existingChange != nil {
// Reuse gerrit change ID if there's already a change up for review.
commitMsg.WriteString("\n\n")
@@ -601,6 +614,14 @@
log.Println("Test results posted for review")
}
+ // We've just pushed a new commit. Let's reset back to the parent commit
+ // (dailyHash), so that we can run updateTestLists again for another backend,
+ // and have it update the commit with the same change-id.
+ if err := git.CheckoutCommit(test.srcDir, dailyHash); err != nil {
+ return cause.Wrap(err, "Failed to checkout parent commit")
+ }
+ log.Println("Checked out parent commit")
+
change, err := r.findTestListChange(client)
if err != nil {
return err
@@ -794,20 +815,34 @@
srcDir := filepath.Join(r.cacheRoot, "src", commit.String())
resDir := filepath.Join(r.cacheRoot, "res", commit.String())
return &test{
- r: r,
- commit: commit,
- srcDir: srcDir,
- resDir: resDir,
- buildDir: filepath.Join(srcDir, "build"),
+ r: r,
+ commit: commit,
+ srcDir: srcDir,
+ resDir: resDir,
+ buildDir: filepath.Join(srcDir, "build"),
+ reactorBackend: llvm,
}
}
+func (t *test) setReactorBackend(reactorBackend reactorBackend) *test {
+ t.reactorBackend = reactorBackend
+ return t
+}
+
+type reactorBackend string
+
+const (
+ llvm reactorBackend = "LLVM"
+ subzero reactorBackend = "Subzero"
+)
+
type test struct {
- r *regres
- commit git.Hash // hash of the commit to test
- srcDir string // directory for the SwiftShader checkout
- resDir string // directory for the test results
- buildDir string // directory for SwiftShader build
+ r *regres
+ commit git.Hash // hash of the commit to test
+ srcDir string // directory for the SwiftShader checkout
+ resDir string // directory for the test results
+ buildDir string // directory for SwiftShader build
+ reactorBackend reactorBackend // backend for SwiftShader build
}
// cleanup removes any temporary files used by the test.
@@ -865,6 +900,7 @@
"-DCMAKE_BUILD_TYPE=Release",
"-DSWIFTSHADER_DCHECK_ALWAYS_ON=1",
"-DREACTOR_VERIFY_LLVM_IR=1",
+ "-DREACTOR_BACKEND="+string(t.reactorBackend),
"-DSWIFTSHADER_WARNINGS_AS_ERRORS=0",
".."); err != nil {
return err
@@ -890,6 +926,10 @@
return nil, fmt.Errorf("Couldn't find '%s'", swiftshaderICDJSON)
}
+ if *limit != 0 && len(testLists) > *limit {
+ testLists = testLists[:*limit]
+ }
+
config := deqp.Config{
ExeEgl: filepath.Join(d.path, "build", "modules", "egl", "deqp-egl"),
ExeGles2: filepath.Join(d.path, "build", "modules", "gles2", "deqp-gles2"),
