[turbofan] Turn IrOpcode::IsXXX() into range checks.

TEST=unittests
R=dcarney@chromium.org

Review URL: https://codereview.chromium.org/807573004

Cr-Commit-Position: refs/heads/master@{#26079}

diff --git a/src/compiler/opcodes.h b/src/compiler/opcodes.h
index b7a2f6b51ba22c1e6bad7403407c77c3781fc91f..fa85974c0136e2ff46b8dcb2007efc75bfed89b3 100644 (file)
--- a/src/compiler/opcodes.h
+++ b/src/compiler/opcodes.h
@@ -275,57 +275,24 @@ class IrOpcode {
   // Returns the mnemonic name of an opcode.
   static char const* Mnemonic(Value value);
 
-  static bool IsJsOpcode(Value val) {
-    switch (val) {
-// TODO(turbofan): make this a range check.
-#define RETURN_NAME(x) \
-  case k##x:           \
-    return true;
-      JS_OP_LIST(RETURN_NAME)
-#undef RETURN_NAME
-      default:
-        return false;
-    }
+  // Returns true if opcode for common operator.
+  static bool IsCommonOpcode(Value value) {
+    return kDead <= value && value <= kProjection;
   }
 
-  static bool IsControlOpcode(Value val) {
-    switch (val) {
-// TODO(turbofan): make this a range check.
-#define RETURN_NAME(x) \
-  case k##x:           \
-    return true;
-      CONTROL_OP_LIST(RETURN_NAME)
-#undef RETURN_NAME
-      default:
-        return false;
-    }
+  // Returns true if opcode for control operator.
+  static bool IsControlOpcode(Value value) {
+    return kDead <= value && value <= kEnd;
   }
 
-  static bool IsLeafOpcode(Value val) {
-    switch (val) {
-// TODO(turbofan): make this a table lookup.
-#define RETURN_NAME(x) \
-  case k##x:           \
-    return true;
-      LEAF_OP_LIST(RETURN_NAME)
-#undef RETURN_NAME
-      default:
-        return false;
-    }
+  // Returns true if opcode for JavaScript operator.
+  static bool IsJsOpcode(Value value) {
+    return kJSEqual <= value && value <= kJSDebugger;
   }
 
-  static bool IsCommonOpcode(Value val) {
-    switch (val) {
-// TODO(turbofan): make this a table lookup or a range check.
-#define RETURN_NAME(x) \
-  case k##x:           \
-    return true;
-      CONTROL_OP_LIST(RETURN_NAME)
-      COMMON_OP_LIST(RETURN_NAME)
-#undef RETURN_NAME
-      default:
-        return false;
-    }
+  // Returns true if opcode for leaf operator.
+  static bool IsLeafOpcode(Value value) {
+    return kInt32Constant <= value && value <= kHeapConstant;
   }
 };
 

diff --git a/test/unittests/compiler/opcodes-unittest.cc b/test/unittests/compiler/opcodes-unittest.cc
index 3a97178c69cb4bc3609da2407bc33ec0c6266262..2a278be0c951012ba60c4b388420fd8009ccbfd7 100644 (file)
--- a/test/unittests/compiler/opcodes-unittest.cc
+++ b/test/unittests/compiler/opcodes-unittest.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <cstring>
-
 #include "src/compiler/opcodes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -11,9 +9,108 @@ namespace v8 {
 namespace internal {
 namespace compiler {
 
+namespace {
+
+bool IsCommonOpcode(IrOpcode::Value opcode) {
+  switch (opcode) {
+#define OPCODE(Opcode)      \
+  case IrOpcode::k##Opcode: \
+    return true;
+    COMMON_OP_LIST(OPCODE)
+    CONTROL_OP_LIST(OPCODE)
+#undef OPCODE
+    default:
+      return false;
+  }
+}
+
+
+bool IsControlOpcode(IrOpcode::Value opcode) {
+  switch (opcode) {
+#define OPCODE(Opcode)      \
+  case IrOpcode::k##Opcode: \
+    return true;
+    CONTROL_OP_LIST(OPCODE)
+#undef OPCODE
+    default:
+      return false;
+  }
+}
+
+
+bool IsJsOpcode(IrOpcode::Value opcode) {
+  switch (opcode) {
+#define OPCODE(Opcode)      \
+  case IrOpcode::k##Opcode: \
+    return true;
+    JS_OP_LIST(OPCODE)
+#undef OPCODE
+    default:
+      return false;
+  }
+}
+
+
+bool IsLeafOpcode(IrOpcode::Value opcode) {
+  switch (opcode) {
+#define OPCODE(Opcode)      \
+  case IrOpcode::k##Opcode: \
+    return true;
+    LEAF_OP_LIST(OPCODE)
+#undef OPCODE
+    default:
+      return false;
+  }
+}
+
+
+const IrOpcode::Value kInvalidOpcode = static_cast<IrOpcode::Value>(123456789);
+
+}  // namespace
+
+
+TEST(IrOpcodeTest, IsCommonOpcode) {
+  EXPECT_FALSE(IrOpcode::IsCommonOpcode(kInvalidOpcode));
+#define OPCODE(Opcode)                           \
+  EXPECT_EQ(IsCommonOpcode(IrOpcode::k##Opcode), \
+            IrOpcode::IsCommonOpcode(IrOpcode::k##Opcode));
+  ALL_OP_LIST(OPCODE)
+#undef OPCODE
+}
+
+
+TEST(IrOpcodeTest, IsControlOpcode) {
+  EXPECT_FALSE(IrOpcode::IsControlOpcode(kInvalidOpcode));
+#define OPCODE(Opcode)                            \
+  EXPECT_EQ(IsControlOpcode(IrOpcode::k##Opcode), \
+            IrOpcode::IsControlOpcode(IrOpcode::k##Opcode));
+  ALL_OP_LIST(OPCODE)
+#undef OPCODE
+}
+
+
+TEST(IrOpcodeTest, IsJsOpcode) {
+  EXPECT_FALSE(IrOpcode::IsJsOpcode(kInvalidOpcode));
+#define OPCODE(Opcode)                       \
+  EXPECT_EQ(IsJsOpcode(IrOpcode::k##Opcode), \
+            IrOpcode::IsJsOpcode(IrOpcode::k##Opcode));
+  ALL_OP_LIST(OPCODE)
+#undef OPCODE
+}
+
+
+TEST(IrOpcodeTest, IsLeafOpcode) {
+  EXPECT_FALSE(IrOpcode::IsLeafOpcode(kInvalidOpcode));
+#define OPCODE(Opcode)                         \
+  EXPECT_EQ(IsLeafOpcode(IrOpcode::k##Opcode), \
+            IrOpcode::IsLeafOpcode(IrOpcode::k##Opcode));
+  ALL_OP_LIST(OPCODE)
+#undef OPCODE
+}
+
+
 TEST(IrOpcodeTest, Mnemonic) {
-  EXPECT_STREQ("UnknownOpcode",
-               IrOpcode::Mnemonic(static_cast<IrOpcode::Value>(123456789)));
+  EXPECT_STREQ("UnknownOpcode", IrOpcode::Mnemonic(kInvalidOpcode));
 #define OPCODE(Opcode) \
   EXPECT_STREQ(#Opcode, IrOpcode::Mnemonic(IrOpcode::k##Opcode));
   ALL_OP_LIST(OPCODE)