Skip to content

Commit c24a216

Browse files
authored
Update testsuite and corresponding update to comment parser (#2416)
The main change here is because `comments.wast` was updated to include a "quoted" module at the top level. Previously quoted modules had only been used as part of invalid or malformed assertion expressions.
1 parent 0df6c26 commit c24a216

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2552
-1714
lines changed

include/wabt/opcode.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,8 @@ WABT_OPCODE(V128, V128, V128, ___, 0, 0xfd, 0x10e, F32X4RelaxedMax, "f32x4.rel
520520
WABT_OPCODE(V128, V128, V128, ___, 0, 0xfd, 0x10f, F64X2RelaxedMin, "f64x2.relaxed_min", "")
521521
WABT_OPCODE(V128, V128, V128, ___, 0, 0xfd, 0x110, F64X2RelaxedMax, "f64x2.relaxed_max", "")
522522
WABT_OPCODE(V128, V128, V128, ___, 0, 0xfd, 0x111, I16X8RelaxedQ15mulrS, "i16x8.relaxed_q15mulr_s", "")
523-
WABT_OPCODE(V128, V128, V128, ___, 0, 0xfd, 0x112, I16X8DotI8X16I7X16S, "i16x8.dot_i8x16_i7x16_s", "")
524-
WABT_OPCODE(V128, V128, V128, V128, 0, 0xfd, 0x113, I32X4DotI8X16I7X16AddS, "i32x4.dot_i8x16_i7x16_add_s", "")
523+
WABT_OPCODE(V128, V128, V128, ___, 0, 0xfd, 0x112, I16X8DotI8X16I7X16S, "i16x8.relaxed_dot_i8x16_i7x16_s", "")
524+
WABT_OPCODE(V128, V128, V128, V128, 0, 0xfd, 0x113, I32X4DotI8X16I7X16AddS, "i32x4.relaxed_dot_i8x16_i7x16_add_s", "")
525525

526526
/* Thread opcodes (--enable-threads) */
527527
WABT_OPCODE(I32, I32, I32, ___, 4, 0xfe, 0x00, MemoryAtomicNotify, "memory.atomic.notify", "")

src/interp/interp.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2469,8 +2469,8 @@ RunResult Thread::DoSimdDot() {
24692469
S result;
24702470
for (u8 i = 0; i < S::lanes; ++i) {
24712471
u8 laneidx = i * 2;
2472-
SL lo = SL(lhs[laneidx]) * SL(rhs[laneidx]);
2473-
SL hi = SL(lhs[laneidx + 1]) * SL(rhs[laneidx + 1]);
2472+
SL lo = SL(lhs[laneidx] * rhs[laneidx]);
2473+
SL hi = SL(lhs[laneidx + 1] * rhs[laneidx + 1]);
24742474
result[i] = Add(lo, hi);
24752475
}
24762476
Push(result);
@@ -2486,8 +2486,8 @@ RunResult Thread::DoSimdDotAdd() {
24862486
S result;
24872487
for (u8 i = 0; i < S::lanes; ++i) {
24882488
u8 laneidx = i * 2;
2489-
SL lo = SL(lhs[laneidx]) * SL(rhs[laneidx]);
2490-
SL hi = SL(lhs[laneidx + 1]) * SL(rhs[laneidx + 1]);
2489+
SL lo = SL(lhs[laneidx] * rhs[laneidx]);
2490+
SL hi = SL(lhs[laneidx + 1] * rhs[laneidx + 1]);
24912491
result[i] = Add(lo, hi);
24922492
result[i] = Add(result[i], acc[i]);
24932493
}

src/lexer-keywords.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ i16x8.add, TokenType::Binary, Opcode::I16X8Add
193193
i16x8.all_true, TokenType::Unary, Opcode::I16X8AllTrue
194194
i16x8.avgr_u, TokenType::Binary, Opcode::I16X8AvgrU
195195
i16x8.bitmask, TokenType::Unary, Opcode::I16X8Bitmask
196-
i16x8.dot_i8x16_i7x16_s, TokenType::Binary, Opcode::I16X8DotI8X16I7X16S
196+
i16x8.relaxed_dot_i8x16_i7x16_s, TokenType::Binary, Opcode::I16X8DotI8X16I7X16S
197197
i16x8.eq, TokenType::Compare, Opcode::I16X8Eq
198198
i16x8.extract_lane_s, TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneS
199199
i16x8.extract_lane_u, TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneU
@@ -319,7 +319,7 @@ i32x4.abs, TokenType::Unary, Opcode::I32X4Abs
319319
i32x4.add, TokenType::Binary, Opcode::I32X4Add
320320
i32x4.all_true, TokenType::Unary, Opcode::I32X4AllTrue
321321
i32x4.bitmask, TokenType::Unary, Opcode::I32X4Bitmask
322-
i32x4.dot_i8x16_i7x16_add_s, TokenType::Ternary, Opcode::I32X4DotI8X16I7X16AddS
322+
i32x4.relaxed_dot_i8x16_i7x16_add_s, TokenType::Ternary, Opcode::I32X4DotI8X16I7X16AddS
323323
i32x4.eq, TokenType::Compare, Opcode::I32X4Eq
324324
i32x4.extract_lane, TokenType::SimdLaneOp, Opcode::I32X4ExtractLane
325325
i32x4.ge_s, TokenType::Compare, Opcode::I32X4GeS

0 commit comments

Comments
 (0)