summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/binaryen-c.cpp2
-rw-r--r--src/binaryen-c.h2
-rw-r--r--src/gen-s-parser.inc4
-rw-r--r--src/ir/cost.h4
-rw-r--r--src/js/binaryen.js-post.js4
-rw-r--r--src/passes/Print.cpp4
-rw-r--r--src/tools/fuzzing/fuzzing.cpp2
-rw-r--r--src/wasm-interpreter.h4
-rw-r--r--src/wasm.h4
-rw-r--r--src/wasm/wasm-binary.cpp4
-rw-r--r--src/wasm/wasm-stack.cpp4
-rw-r--r--src/wasm/wasm-validator.cpp4
12 files changed, 21 insertions, 21 deletions
diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp
index d884626b2..ecdbadefd 100644
--- a/src/binaryen-c.cpp
+++ b/src/binaryen-c.cpp
@@ -757,7 +757,7 @@ BinaryenOp BinaryenDemoteZeroVecF64x2ToVecF32x4(void) {
BinaryenOp BinaryenPromoteLowVecF32x4ToVecF64x2(void) {
return PromoteLowVecF32x4ToVecF64x2;
}
-BinaryenOp BinaryenSwizzleVec8x16(void) { return SwizzleVec8x16; }
+BinaryenOp BinaryenSwizzleVecI8x16(void) { return SwizzleVecI8x16; }
BinaryenOp BinaryenRefIsNull(void) { return RefIsNull; }
BinaryenOp BinaryenRefIsFunc(void) { return RefIsFunc; }
BinaryenOp BinaryenRefIsData(void) { return RefIsData; }
diff --git a/src/binaryen-c.h b/src/binaryen-c.h
index e5a02d556..ed0f01f1c 100644
--- a/src/binaryen-c.h
+++ b/src/binaryen-c.h
@@ -592,7 +592,7 @@ BINARYEN_API BinaryenOp BinaryenTruncSatZeroSVecF64x2ToVecI32x4(void);
BINARYEN_API BinaryenOp BinaryenTruncSatZeroUVecF64x2ToVecI32x4(void);
BINARYEN_API BinaryenOp BinaryenDemoteZeroVecF64x2ToVecF32x4(void);
BINARYEN_API BinaryenOp BinaryenPromoteLowVecF32x4ToVecF64x2(void);
-BINARYEN_API BinaryenOp BinaryenSwizzleVec8x16(void);
+BINARYEN_API BinaryenOp BinaryenSwizzleVecI8x16(void);
BINARYEN_API BinaryenOp BinaryenRefIsNull(void);
BINARYEN_API BinaryenOp BinaryenRefIsFunc(void);
BINARYEN_API BinaryenOp BinaryenRefIsData(void);
diff --git a/src/gen-s-parser.inc b/src/gen-s-parser.inc
index a9f8b5aab..895676fa8 100644
--- a/src/gen-s-parser.inc
+++ b/src/gen-s-parser.inc
@@ -2836,7 +2836,7 @@ switch (op[0]) {
case 'r': {
switch (op[8]) {
case 'l':
- if (strcmp(op, "i8x16.relaxed_swizzle") == 0) { return makeBinary(s, BinaryOp::RelaxedSwizzleVec8x16); }
+ if (strcmp(op, "i8x16.relaxed_swizzle") == 0) { return makeBinary(s, BinaryOp::RelaxedSwizzleVecI8x16); }
goto parse_error;
case 'p':
if (strcmp(op, "i8x16.replace_lane") == 0) { return makeSIMDReplace(s, SIMDReplaceOp::ReplaceLaneVecI8x16, 16); }
@@ -2891,7 +2891,7 @@ switch (op[0]) {
}
}
case 'w':
- if (strcmp(op, "i8x16.swizzle") == 0) { return makeBinary(s, BinaryOp::SwizzleVec8x16); }
+ if (strcmp(op, "i8x16.swizzle") == 0) { return makeBinary(s, BinaryOp::SwizzleVecI8x16); }
goto parse_error;
default: goto parse_error;
}
diff --git a/src/ir/cost.h b/src/ir/cost.h
index fdd49047a..9423101d3 100644
--- a/src/ir/cost.h
+++ b/src/ir/cost.h
@@ -491,8 +491,8 @@ struct CostAnalyzer : public OverriddenVisitor<CostAnalyzer, CostType> {
case NarrowUVecI16x8ToVecI8x16:
case NarrowSVecI32x4ToVecI16x8:
case NarrowUVecI32x4ToVecI16x8:
- case SwizzleVec8x16:
- case RelaxedSwizzleVec8x16:
+ case SwizzleVecI8x16:
+ case RelaxedSwizzleVecI8x16:
case RelaxedQ15MulrSVecI16x8:
ret = 1;
break;
diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js
index 7dfeee26c..28f5b6258 100644
--- a/src/js/binaryen.js-post.js
+++ b/src/js/binaryen.js-post.js
@@ -530,7 +530,7 @@ function initializeConstants() {
'TruncSatZeroUVecF64x2ToVecI32x4',
'DemoteZeroVecF64x2ToVecF32x4',
'PromoteLowVecF32x4ToVecF64x2',
- 'SwizzleVec8x16',
+ 'SwizzleVecI8x16',
'RefIsNull',
'RefIsFunc',
'RefIsData',
@@ -1597,7 +1597,7 @@ function wrapModule(module, self = {}) {
return preserveStack(() => Module['_BinaryenSIMDShuffle'](module, left, right, i8sToStack(mask)));
},
'swizzle'(left, right) {
- return Module['_BinaryenBinary'](module, Module['SwizzleVec8x16'], left, right);
+ return Module['_BinaryenBinary'](module, Module['SwizzleVecI8x16'], left, right);
},
'splat'(value) {
return Module['_BinaryenUnary'](module, Module['SplatVecI8x16'], value);
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
index edb95aba1..240db975b 100644
--- a/src/passes/Print.cpp
+++ b/src/passes/Print.cpp
@@ -1832,7 +1832,7 @@ struct PrintExpressionContents
o << "i16x8.narrow_i32x4_u";
break;
- case SwizzleVec8x16:
+ case SwizzleVecI8x16:
o << "i8x16.swizzle";
break;
@@ -1848,7 +1848,7 @@ struct PrintExpressionContents
case RelaxedMaxVecF64x2:
o << "f64x2.relaxed_max";
break;
- case RelaxedSwizzleVec8x16:
+ case RelaxedSwizzleVecI8x16:
o << "i8x16.relaxed_swizzle";
break;
case RelaxedQ15MulrSVecI16x8:
diff --git a/src/tools/fuzzing/fuzzing.cpp b/src/tools/fuzzing/fuzzing.cpp
index a41e6704e..064871931 100644
--- a/src/tools/fuzzing/fuzzing.cpp
+++ b/src/tools/fuzzing/fuzzing.cpp
@@ -2442,7 +2442,7 @@ Expression* TranslateToFuzzReader::makeBinary(Type type) {
NarrowUVecI16x8ToVecI8x16,
NarrowSVecI32x4ToVecI16x8,
NarrowUVecI32x4ToVecI16x8,
- SwizzleVec8x16),
+ SwizzleVecI8x16),
make(Type::v128),
make(Type::v128)});
}
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index c695f26a2..416647137 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -1012,8 +1012,8 @@ public:
case NarrowUVecI32x4ToVecI16x8:
return left.narrowUToI16x8(right);
- case SwizzleVec8x16:
- case RelaxedSwizzleVec8x16:
+ case SwizzleVecI8x16:
+ case RelaxedSwizzleVecI8x16:
return left.swizzleI8x16(right);
case InvalidBinary:
diff --git a/src/wasm.h b/src/wasm.h
index d361652b4..2bf057c7b 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -464,10 +464,10 @@ enum BinaryOp {
NarrowUVecI32x4ToVecI16x8,
// SIMD Swizzle
- SwizzleVec8x16,
+ SwizzleVecI8x16,
// Relaxed SIMD
- RelaxedSwizzleVec8x16,
+ RelaxedSwizzleVecI8x16,
RelaxedMinVecF32x4,
RelaxedMaxVecF32x4,
RelaxedMinVecF64x2,
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index 097ce2ae1..026e277fb 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -5575,11 +5575,11 @@ bool WasmBinaryBuilder::maybeVisitSIMDBinary(Expression*& out, uint32_t code) {
break;
case BinaryConsts::I8x16Swizzle:
curr = allocator.alloc<Binary>();
- curr->op = SwizzleVec8x16;
+ curr->op = SwizzleVecI8x16;
break;
case BinaryConsts::I8x16RelaxedSwizzle:
curr = allocator.alloc<Binary>();
- curr->op = RelaxedSwizzleVec8x16;
+ curr->op = RelaxedSwizzleVecI8x16;
break;
case BinaryConsts::F32x4RelaxedMin:
curr = allocator.alloc<Binary>();
diff --git a/src/wasm/wasm-stack.cpp b/src/wasm/wasm-stack.cpp
index 98b681e1b..67104a8f1 100644
--- a/src/wasm/wasm-stack.cpp
+++ b/src/wasm/wasm-stack.cpp
@@ -1817,12 +1817,12 @@ void BinaryInstWriter::visitBinary(Binary* curr) {
<< U32LEB(BinaryConsts::I16x8NarrowI32x4U);
break;
- case SwizzleVec8x16:
+ case SwizzleVecI8x16:
o << int8_t(BinaryConsts::SIMDPrefix)
<< U32LEB(BinaryConsts::I8x16Swizzle);
break;
- case RelaxedSwizzleVec8x16:
+ case RelaxedSwizzleVecI8x16:
o << int8_t(BinaryConsts::SIMDPrefix)
<< U32LEB(BinaryConsts::I8x16RelaxedSwizzle);
break;
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
index 1494fa400..dd896e139 100644
--- a/src/wasm/wasm-validator.cpp
+++ b/src/wasm/wasm-validator.cpp
@@ -1633,8 +1633,8 @@ void FunctionValidator::visitBinary(Binary* curr) {
case NarrowUVecI16x8ToVecI8x16:
case NarrowSVecI32x4ToVecI16x8:
case NarrowUVecI32x4ToVecI16x8:
- case SwizzleVec8x16:
- case RelaxedSwizzleVec8x16:
+ case SwizzleVecI8x16:
+ case RelaxedSwizzleVecI8x16:
case RelaxedQ15MulrSVecI16x8: {
shouldBeEqualOrFirstIsUnreachable(
curr->left->type, Type(Type::v128), curr, "v128 op");