[wasm][cleanup] Merge opcode names into main macros

This merges the separate opcode name definitions from wasm-opcodes-inl.h
into the main opcode-defining macros in wasm-opcodes.h. This is simpler
(avoids a bunch of fairly complex macros) and easier to update when we
add new opcodes in the future.
The tests become obsolete because they would simply repeat the implementation.

Change-Id: Ib6421da5670079e7725659c1f4008251f8ff7aed
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3714244
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/main@{#81280}

src/wasm/function-body-decoder-impl.h

@@ -2064,7 +2064,7 @@ class WasmDecoder : public Decoder {
       // Prefixed opcodes (already handled, included here for completeness of
       // switch)
       FOREACH_SIMD_OPCODE(DECLARE_OPCODE_CASE)
-      FOREACH_NUMERIC_OPCODE(DECLARE_OPCODE_CASE, DECLARE_OPCODE_CASE)
+      FOREACH_NUMERIC_OPCODE(DECLARE_OPCODE_CASE)
       FOREACH_ATOMIC_OPCODE(DECLARE_OPCODE_CASE)
       FOREACH_ATOMIC_0_OPERAND_OPCODE(DECLARE_OPCODE_CASE)
       FOREACH_GC_OPCODE(DECLARE_OPCODE_CASE)
@@ -2087,7 +2087,7 @@ class WasmDecoder : public Decoder {
     if (!sig) sig = WasmOpcodes::AsmjsSignature(opcode);
     if (sig) return {sig->parameter_count(), sig->return_count()};
 
-#define DECLARE_OPCODE_CASE(name, opcode, sig) case kExpr##name:
+#define DECLARE_OPCODE_CASE(name, ...) case kExpr##name:
     // clang-format off
     switch (opcode) {
       case kExprSelect:
@@ -2743,12 +2743,12 @@ class WasmFullDecoder : public WasmDecoder<validate, decoding_mode> {
     return 1;
   }
 
-#define BUILD_SIMPLE_OPCODE(op, _, sig) \
+#define BUILD_SIMPLE_OPCODE(op, _, sig, ...) \
   DECODE(op) { return BuildSimpleOperator_##sig(kExpr##op); }
   FOREACH_SIMPLE_NON_CONST_OPCODE(BUILD_SIMPLE_OPCODE)
 #undef BUILD_SIMPLE_OPCODE
 
-#define BUILD_SIMPLE_OPCODE(op, _, sig)                     \
+#define BUILD_SIMPLE_OPCODE(op, _, sig, ...)                \
   DECODE(op) {                                              \
     if (decoding_mode == kConstantExpression) {             \
       if (!VALIDATE(this->enabled_.has_extended_const())) { \
@@ -3657,7 +3657,7 @@ class WasmFullDecoder : public WasmDecoder<validate, decoding_mode> {
     }
   }
 
-#define SIMPLE_PROTOTYPE_CASE(name, opc, sig) \
+#define SIMPLE_PROTOTYPE_CASE(name, ...) \
   DECODE(name) { return BuildSimplePrototypeOperator(opcode); }
   FOREACH_SIMPLE_PROTOTYPE_OPCODE(SIMPLE_PROTOTYPE_CASE)
 #undef SIMPLE_PROTOTYPE_CASE
@@ -3704,10 +3704,10 @@ class WasmFullDecoder : public WasmDecoder<validate, decoding_mode> {
 
   static constexpr OpcodeHandler GetOpcodeHandlerTableEntry(size_t idx) {
     DECODE_IMPL(Nop);
-#define BUILD_SIMPLE_OPCODE(op, _, sig) DECODE_IMPL(op);
+#define BUILD_SIMPLE_OPCODE(op, ...) DECODE_IMPL(op);
     FOREACH_SIMPLE_NON_CONST_OPCODE(BUILD_SIMPLE_OPCODE)
 #undef BUILD_SIMPLE_OPCODE
-#define BUILD_SIMPLE_EXTENDED_CONST_OPCODE(op, _, sig) DECODE_IMPL_CONST(op);
+#define BUILD_SIMPLE_EXTENDED_CONST_OPCODE(op, ...) DECODE_IMPL_CONST(op);
     FOREACH_SIMPLE_EXTENDED_CONST_OPCODE(BUILD_SIMPLE_EXTENDED_CONST_OPCODE)
 #undef BUILD_SIMPLE_EXTENDED_CONST_OPCODE
     DECODE_IMPL(Block);
@@ -3766,7 +3766,7 @@ class WasmFullDecoder : public WasmDecoder<validate, decoding_mode> {
     DECODE_IMPL_CONST2(kSimdPrefix, Simd);
     DECODE_IMPL2(kAtomicPrefix, Atomic);
     DECODE_IMPL_CONST2(kGCPrefix, GC);
-#define SIMPLE_PROTOTYPE_CASE(name, opc, sig) DECODE_IMPL(name);
+#define SIMPLE_PROTOTYPE_CASE(name, ...) DECODE_IMPL(name);
     FOREACH_SIMPLE_PROTOTYPE_OPCODE(SIMPLE_PROTOTYPE_CASE)
 #undef SIMPLE_PROTOTYPE_CASE
     return &WasmFullDecoder::DecodeUnknownOrAsmJs;

test/cctest/wasm/test-run-wasm.cc

@@ -2116,7 +2116,7 @@ static void TestBuildGraphForSimpleExpression(WasmOpcode opcode) {
 
 TEST(Build_Wasm_SimpleExprs) {
 // Test that the decoder can build a graph for all supported simple expressions.
-#define GRAPH_BUILD_TEST(name, opcode, sig) \
+#define GRAPH_BUILD_TEST(name, ...) \
   TestBuildGraphForSimpleExpression(kExpr##name);
 
   FOREACH_SIMPLE_OPCODE(GRAPH_BUILD_TEST);

test/unittests/BUILD.gn

@@ -506,7 +506,6 @@ v8_source_set("unittests_sources") {
       "wasm/wasm-macro-gen-unittest.cc",
       "wasm/wasm-module-builder-unittest.cc",
       "wasm/wasm-module-sourcemap-unittest.cc",
-      "wasm/wasm-opcodes-unittest.cc",
     ]
   }
 

test/unittests/wasm/function-body-decoder-unittest.cc

@@ -1517,7 +1517,7 @@ TEST_F(FunctionBodyDecoderTest, MacrosInt64) {
 
 TEST_F(FunctionBodyDecoderTest, AllSimpleExpressions) {
 // Test all simple expressions which are described by a signature.
-#define DECODE_TEST(name, opcode, sig)                            \
+#define DECODE_TEST(name, opcode, sig, ...)                       \
   {                                                               \
     const FunctionSig* sig = WasmOpcodes::Signature(kExpr##name); \
     if (sig->parameter_count() == 1) {                            \
@@ -4805,7 +4805,7 @@ TEST_F(WasmOpcodeLengthTest, MiscMemExpressions) {
 }
 
 TEST_F(WasmOpcodeLengthTest, SimpleExpressions) {
-#define SIMPLE_OPCODE(name, byte, sig) byte,
+#define SIMPLE_OPCODE(name, byte, ...) byte,
   static constexpr uint8_t kSimpleOpcodes[] = {
       FOREACH_SIMPLE_OPCODE(SIMPLE_OPCODE)};
 #undef SIMPLE_OPCODE
@@ -4815,10 +4815,10 @@ TEST_F(WasmOpcodeLengthTest, SimpleExpressions) {
 }
 
 TEST_F(WasmOpcodeLengthTest, SimdExpressions) {
-#define TEST_SIMD(name, opcode, sig) ExpectLengthPrefixed(0, kExpr##name);
+#define TEST_SIMD(name, ...) ExpectLengthPrefixed(0, kExpr##name);
   FOREACH_SIMD_0_OPERAND_OPCODE(TEST_SIMD)
 #undef TEST_SIMD
-#define TEST_SIMD(name, opcode, sig) ExpectLengthPrefixed(1, kExpr##name);
+#define TEST_SIMD(name, ...) ExpectLengthPrefixed(1, kExpr##name);
   FOREACH_SIMD_1_OPERAND_OPCODE(TEST_SIMD)
 #undef TEST_SIMD
   ExpectLengthPrefixed(16, kExprI8x16Shuffle);