commit e4692de674b295395775718c037476460af635ff
author John Stiles <johnstiles@google.com> Wed Nov 17 19:21:04 2021 -0500
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Thu Nov 18 04:50:37 2021 +0000
tree b996a1d4b0e72fba6fa14a00e948b87f04259fe1
parent c5b90df0be4f19b9f08daabd7407ddf8995ff3d8

Force the SkVM interpreter if trace opcodes are encountered.

Trace opcodes will only be implemented in the interpreter. If we
encounter one while JITting a program, returning false will cause
execution to fall back to the interpreter automatically.

Change-Id: I94fce376cb7336c16072a174604de025f1b4e38a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/473137
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Herb Derby <herb@google.com>

src/core/SkVM.cpp

diff --git a/src/core/SkVM.cpp b/src/core/SkVM.cpp
index f728c36..ed72628 100644
--- a/src/core/SkVM.cpp
+++ b/src/core/SkVM.cpp
@@ -2678,8 +2678,8 @@
                 case Op::trace_line:
                 case Op::trace_var:
                 case Op::trace_call:
-                    /* Only supported in the interpreter. */
-                    break;
+                    /* Force this program to run in the interpreter. */
+                    return false;
 
                 case Op::index:
                     if (I32->isVectorTy()) {
@@ -3608,8 +3608,8 @@
                 case Op::trace_line:
                 case Op::trace_var:
                 case Op::trace_call:
-                    /* Only supported in the interpreter. */
-                    break;
+                    /* Force this program to run in the interpreter. */
+                    return false;
 
                 case Op::store8:
                     if (scalar) {
@@ -3978,8 +3978,8 @@
                 case Op::trace_line:
                 case Op::trace_var:
                 case Op::trace_call:
-                    /* Only supported in the interpreter. */
-                    break;
+                    /* Force this program to run in the interpreter. */
+                    return false;
 
                 case Op::index: {
                     A::V tmp = alloc_tmp();