From 297d5a03e603112afefbf81717d359b925b2bd6a Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 7 Nov 2019 15:35:01 +0000 Subject: [PATCH] Revert "hook up float comparisons to x86 JIT" This reverts commit 12cea8d6c429d06425be97af31db7c31655e5290. Reason for revert: unit tests failing on ARM... will try again once I have float comparisons implemented for ARM too. Original change's description: > hook up float comparisons to x86 JIT > > This gets the draws in gm/skvm.cpp all JITing again, > and in one of the unit tests. > > (Everything draws the same of course.) > > Change-Id: Iada28690d9df78f9d444ee3765e21beb29239672 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253166 > Auto-Submit: Mike Klein > Reviewed-by: Mike Klein > Commit-Queue: Mike Klein TBR=mtklein@google.com,reed@google.com Change-Id: Ie07e580b4998199338217a27d4fad34c679ffc23 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253399 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- src/core/SkVM.cpp | 7 ------- tests/SkVMTest.cpp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/core/SkVM.cpp b/src/core/SkVM.cpp index ceacf8a995..2c2d899037 100644 --- a/src/core/SkVM.cpp +++ b/src/core/SkVM.cpp @@ -1906,13 +1906,6 @@ namespace skvm { case Op::lt_i32: a->vpcmpgtd(dst(), r[y], r[x]); break; case Op::gt_i32: a->vpcmpgtd(dst(), r[x], r[y]); break; - case Op:: eq_f32: a->vcmpeqps (dst(), r[x], r[y]); break; - case Op::neq_f32: a->vcmpneqps(dst(), r[x], r[y]); break; - case Op:: lt_f32: a->vcmpltps (dst(), r[x], r[y]); break; - case Op::lte_f32: a->vcmpleps (dst(), r[x], r[y]); break; - case Op:: gt_f32: a->vcmpltps (dst(), r[y], r[x]); break; - case Op::gte_f32: a->vcmpleps (dst(), r[y], r[x]); break; - case Op::extract: if (imm == 0) { a->vpand (dst(), r[x], r[y]); } else { a->vpsrld(tmp(), r[x], imm); a->vpand (dst(), tmp(), r[y]); } diff --git a/tests/SkVMTest.cpp b/tests/SkVMTest.cpp index 0c7f0d7903..7c51187cdd 100644 --- a/tests/SkVMTest.cpp +++ b/tests/SkVMTest.cpp @@ -469,7 +469,7 @@ DEF_TEST(SkVM_cmp_f32, r) { b.store32(b.varying(), m); } - test_jit_and_interpreter(r, b.done(), [&](const skvm::Program& program) { + test_interpreter_only(r, b.done(), [&](const skvm::Program& program) { float in[] = { 0,1,2,3,4,5,6,7,8,9 }; int out[SK_ARRAY_COUNT(in)];