summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gen-s-parser.inc68
-rw-r--r--src/ir/child-typer.h7
-rw-r--r--src/ir/cost.h7
-rw-r--r--src/literal.h7
-rw-r--r--src/passes/Print.cpp21
-rw-r--r--src/tools/fuzzing/fuzzing.cpp61
-rw-r--r--src/wasm-binary.h7
-rw-r--r--src/wasm-interpreter.h14
-rw-r--r--src/wasm.h7
-rw-r--r--src/wasm/literal.cpp36
-rw-r--r--src/wasm/wasm-binary.cpp28
-rw-r--r--src/wasm/wasm-stack.cpp22
-rw-r--r--src/wasm/wasm-validator.cpp11
-rw-r--r--src/wasm/wasm.cpp7
14 files changed, 263 insertions, 40 deletions
diff --git a/src/gen-s-parser.inc b/src/gen-s-parser.inc
index f4afd1f1b..7d4fbe819 100644
--- a/src/gen-s-parser.inc
+++ b/src/gen-s-parser.inc
@@ -309,9 +309,26 @@ switch (buf[0]) {
switch (buf[1]) {
case '1': {
switch (buf[6]) {
- case 'a':
- if (op == "f16x8.add"sv) {
- CHECK_ERR(makeBinary(ctx, pos, annotations, BinaryOp::AddVecF16x8));
+ case 'a': {
+ switch (buf[7]) {
+ case 'b':
+ if (op == "f16x8.abs"sv) {
+ CHECK_ERR(makeUnary(ctx, pos, annotations, UnaryOp::AbsVecF16x8));
+ return Ok{};
+ }
+ goto parse_error;
+ case 'd':
+ if (op == "f16x8.add"sv) {
+ CHECK_ERR(makeBinary(ctx, pos, annotations, BinaryOp::AddVecF16x8));
+ return Ok{};
+ }
+ goto parse_error;
+ default: goto parse_error;
+ }
+ }
+ case 'c':
+ if (op == "f16x8.ceil"sv) {
+ CHECK_ERR(makeUnary(ctx, pos, annotations, UnaryOp::CeilVecF16x8));
return Ok{};
}
goto parse_error;
@@ -338,6 +355,12 @@ switch (buf[0]) {
default: goto parse_error;
}
}
+ case 'f':
+ if (op == "f16x8.floor"sv) {
+ CHECK_ERR(makeUnary(ctx, pos, annotations, UnaryOp::FloorVecF16x8));
+ return Ok{};
+ }
+ goto parse_error;
case 'g': {
switch (buf[7]) {
case 'e':
@@ -395,12 +418,29 @@ switch (buf[0]) {
default: goto parse_error;
}
}
- case 'n':
- if (op == "f16x8.ne"sv) {
- CHECK_ERR(makeBinary(ctx, pos, annotations, BinaryOp::NeVecF16x8));
- return Ok{};
+ case 'n': {
+ switch (buf[8]) {
+ case '\0':
+ if (op == "f16x8.ne"sv) {
+ CHECK_ERR(makeBinary(ctx, pos, annotations, BinaryOp::NeVecF16x8));
+ return Ok{};
+ }
+ goto parse_error;
+ case 'a':
+ if (op == "f16x8.nearest"sv) {
+ CHECK_ERR(makeUnary(ctx, pos, annotations, UnaryOp::NearestVecF16x8));
+ return Ok{};
+ }
+ goto parse_error;
+ case 'g':
+ if (op == "f16x8.neg"sv) {
+ CHECK_ERR(makeUnary(ctx, pos, annotations, UnaryOp::NegVecF16x8));
+ return Ok{};
+ }
+ goto parse_error;
+ default: goto parse_error;
}
- goto parse_error;
+ }
case 'p': {
switch (buf[8]) {
case 'a':
@@ -432,6 +472,12 @@ switch (buf[0]) {
return Ok{};
}
goto parse_error;
+ case 'q':
+ if (op == "f16x8.sqrt"sv) {
+ CHECK_ERR(makeUnary(ctx, pos, annotations, UnaryOp::SqrtVecF16x8));
+ return Ok{};
+ }
+ goto parse_error;
case 'u':
if (op == "f16x8.sub"sv) {
CHECK_ERR(makeBinary(ctx, pos, annotations, BinaryOp::SubVecF16x8));
@@ -441,6 +487,12 @@ switch (buf[0]) {
default: goto parse_error;
}
}
+ case 't':
+ if (op == "f16x8.trunc"sv) {
+ CHECK_ERR(makeUnary(ctx, pos, annotations, UnaryOp::TruncVecF16x8));
+ return Ok{};
+ }
+ goto parse_error;
default: goto parse_error;
}
}
diff --git a/src/ir/child-typer.h b/src/ir/child-typer.h
index fe65b209b..638bb9c33 100644
--- a/src/ir/child-typer.h
+++ b/src/ir/child-typer.h
@@ -372,6 +372,13 @@ template<typename Subtype> struct ChildTyper : OverriddenVisitor<Subtype> {
case NegVecI16x8:
case NegVecI32x4:
case NegVecI64x2:
+ case AbsVecF16x8:
+ case NegVecF16x8:
+ case SqrtVecF16x8:
+ case CeilVecF16x8:
+ case FloorVecF16x8:
+ case TruncVecF16x8:
+ case NearestVecF16x8:
case AbsVecF32x4:
case NegVecF32x4:
case SqrtVecF32x4:
diff --git a/src/ir/cost.h b/src/ir/cost.h
index 0b2b6315b..f541a4506 100644
--- a/src/ir/cost.h
+++ b/src/ir/cost.h
@@ -206,6 +206,13 @@ struct CostAnalyzer : public OverriddenVisitor<CostAnalyzer, CostType> {
case NegVecI64x2:
case AllTrueVecI64x2:
case BitmaskVecI64x2:
+ case AbsVecF16x8:
+ case NegVecF16x8:
+ case SqrtVecF16x8:
+ case CeilVecF16x8:
+ case FloorVecF16x8:
+ case TruncVecF16x8:
+ case NearestVecF16x8:
case AbsVecF32x4:
case NegVecF32x4:
case SqrtVecF32x4:
diff --git a/src/literal.h b/src/literal.h
index df9a16d9a..7bedab5b4 100644
--- a/src/literal.h
+++ b/src/literal.h
@@ -618,6 +618,9 @@ public:
Literal extMulHighSI64x2(const Literal& other) const;
Literal extMulLowUI64x2(const Literal& other) const;
Literal extMulHighUI64x2(const Literal& other) const;
+ Literal absF16x8() const;
+ Literal negF16x8() const;
+ Literal sqrtF16x8() const;
Literal addF16x8(const Literal& other) const;
Literal subF16x8(const Literal& other) const;
Literal mulF16x8(const Literal& other) const;
@@ -626,6 +629,10 @@ public:
Literal maxF16x8(const Literal& other) const;
Literal pminF16x8(const Literal& other) const;
Literal pmaxF16x8(const Literal& other) const;
+ Literal ceilF16x8() const;
+ Literal floorF16x8() const;
+ Literal truncF16x8() const;
+ Literal nearestF16x8() const;
Literal absF32x4() const;
Literal negF32x4() const;
Literal sqrtF32x4() const;
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
index 4986982c7..8f53481b7 100644
--- a/src/passes/Print.cpp
+++ b/src/passes/Print.cpp
@@ -1209,6 +1209,27 @@ struct PrintExpressionContents
case BitmaskVecI64x2:
o << "i64x2.bitmask";
break;
+ case AbsVecF16x8:
+ o << "f16x8.abs";
+ break;
+ case NegVecF16x8:
+ o << "f16x8.neg";
+ break;
+ case SqrtVecF16x8:
+ o << "f16x8.sqrt";
+ break;
+ case CeilVecF16x8:
+ o << "f16x8.ceil";
+ break;
+ case FloorVecF16x8:
+ o << "f16x8.floor";
+ break;
+ case TruncVecF16x8:
+ o << "f16x8.trunc";
+ break;
+ case NearestVecF16x8:
+ o << "f16x8.nearest";
+ break;
case AbsVecF32x4:
o << "f32x4.abs";
break;
diff --git a/src/tools/fuzzing/fuzzing.cpp b/src/tools/fuzzing/fuzzing.cpp
index 7a3007e43..a66fa6772 100644
--- a/src/tools/fuzzing/fuzzing.cpp
+++ b/src/tools/fuzzing/fuzzing.cpp
@@ -3109,31 +3109,42 @@ Expression* TranslateToFuzzReader::makeUnary(Type type) {
case 3:
return buildUnary({SplatVecF64x2, make(Type::f64)});
case 4:
- return buildUnary({pick(NotVec128,
- // TODO: add additional SIMD instructions
- NegVecI8x16,
- NegVecI16x8,
- NegVecI32x4,
- NegVecI64x2,
- AbsVecF32x4,
- NegVecF32x4,
- SqrtVecF32x4,
- AbsVecF64x2,
- NegVecF64x2,
- SqrtVecF64x2,
- TruncSatSVecF32x4ToVecI32x4,
- TruncSatUVecF32x4ToVecI32x4,
- ConvertSVecI32x4ToVecF32x4,
- ConvertUVecI32x4ToVecF32x4,
- ExtendLowSVecI8x16ToVecI16x8,
- ExtendHighSVecI8x16ToVecI16x8,
- ExtendLowUVecI8x16ToVecI16x8,
- ExtendHighUVecI8x16ToVecI16x8,
- ExtendLowSVecI16x8ToVecI32x4,
- ExtendHighSVecI16x8ToVecI32x4,
- ExtendLowUVecI16x8ToVecI32x4,
- ExtendHighUVecI16x8ToVecI32x4),
- make(Type::v128)});
+ return buildUnary(
+ {pick(FeatureOptions<UnaryOp>()
+ .add(FeatureSet::SIMD,
+ NotVec128,
+ // TODO: add additional SIMD instructions
+ NegVecI8x16,
+ NegVecI16x8,
+ NegVecI32x4,
+ NegVecI64x2,
+ AbsVecF32x4,
+ NegVecF32x4,
+ SqrtVecF32x4,
+ AbsVecF64x2,
+ NegVecF64x2,
+ SqrtVecF64x2,
+ TruncSatSVecF32x4ToVecI32x4,
+ TruncSatUVecF32x4ToVecI32x4,
+ ConvertSVecI32x4ToVecF32x4,
+ ConvertUVecI32x4ToVecF32x4,
+ ExtendLowSVecI8x16ToVecI16x8,
+ ExtendHighSVecI8x16ToVecI16x8,
+ ExtendLowUVecI8x16ToVecI16x8,
+ ExtendHighUVecI8x16ToVecI16x8,
+ ExtendLowSVecI16x8ToVecI32x4,
+ ExtendHighSVecI16x8ToVecI32x4,
+ ExtendLowUVecI16x8ToVecI32x4,
+ ExtendHighUVecI16x8ToVecI32x4)
+ .add(FeatureSet::FP16,
+ AbsVecF16x8,
+ NegVecF16x8,
+ SqrtVecF16x8,
+ CeilVecF16x8,
+ FloorVecF16x8,
+ TruncVecF16x8,
+ NearestVecF16x8)),
+ make(Type::v128)});
}
WASM_UNREACHABLE("invalid value");
}
diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index a4439f026..9ce355b48 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -1059,6 +1059,13 @@ enum ASTNodes {
F16x8Splat = 0x120,
F16x8ExtractLane = 0x121,
F16x8ReplaceLane = 0x122,
+ F16x8Abs = 0x130,
+ F16x8Neg = 0x131,
+ F16x8Sqrt = 0x132,
+ F16x8Ceil = 0x133,
+ F16x8Floor = 0x134,
+ F16x8Trunc = 0x135,
+ F16x8Nearest = 0x136,
F16x8Eq = 0x137,
F16x8Ne = 0x138,
F16x8Lt = 0x139,
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 77349fd33..50fc296fe 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -531,6 +531,20 @@ public:
return value.allTrueI64x2();
case BitmaskVecI64x2:
return value.bitmaskI64x2();
+ case AbsVecF16x8:
+ return value.absF16x8();
+ case NegVecF16x8:
+ return value.negF16x8();
+ case SqrtVecF16x8:
+ return value.sqrtF16x8();
+ case CeilVecF16x8:
+ return value.ceilF16x8();
+ case FloorVecF16x8:
+ return value.floorF16x8();
+ case TruncVecF16x8:
+ return value.truncF16x8();
+ case NearestVecF16x8:
+ return value.nearestF16x8();
case AbsVecF32x4:
return value.absF32x4();
case NegVecF32x4:
diff --git a/src/wasm.h b/src/wasm.h
index 6f82196b7..a707ab7a4 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -179,6 +179,13 @@ enum UnaryOp {
NegVecI64x2,
AllTrueVecI64x2,
BitmaskVecI64x2,
+ AbsVecF16x8,
+ NegVecF16x8,
+ SqrtVecF16x8,
+ CeilVecF16x8,
+ FloorVecF16x8,
+ TruncVecF16x8,
+ NearestVecF16x8,
AbsVecF32x4,
NegVecF32x4,
SqrtVecF32x4,
diff --git a/src/wasm/literal.cpp b/src/wasm/literal.cpp
index 6a4614a90..1b84ba53c 100644
--- a/src/wasm/literal.cpp
+++ b/src/wasm/literal.cpp
@@ -1842,13 +1842,19 @@ Literal Literal::replaceLaneF64x2(const Literal& other, uint8_t index) const {
return replace<2, &Literal::getLanesF64x2>(*this, other, index);
}
+static Literal passThrough(const Literal& literal) { return literal; }
+static Literal toFP16(const Literal& literal) {
+ return literal.convertF32ToF16();
+}
+
template<int Lanes,
LaneArray<Lanes> (Literal::*IntoLanes)() const,
- Literal (Literal::*UnaryOp)(void) const>
+ Literal (Literal::*UnaryOp)(void) const,
+ Literal (*Convert)(const Literal&) = passThrough>
static Literal unary(const Literal& val) {
LaneArray<Lanes> lanes = (val.*IntoLanes)();
for (size_t i = 0; i < Lanes; ++i) {
- lanes[i] = (lanes[i].*UnaryOp)();
+ lanes[i] = Convert((lanes[i].*UnaryOp)());
}
return Literal(lanes);
}
@@ -1885,6 +1891,27 @@ Literal Literal::negI32x4() const {
Literal Literal::negI64x2() const {
return unary<2, &Literal::getLanesI64x2, &Literal::neg>(*this);
}
+Literal Literal::absF16x8() const {
+ return unary<8, &Literal::getLanesF16x8, &Literal::abs, &toFP16>(*this);
+}
+Literal Literal::negF16x8() const {
+ return unary<8, &Literal::getLanesF16x8, &Literal::neg, &toFP16>(*this);
+}
+Literal Literal::sqrtF16x8() const {
+ return unary<8, &Literal::getLanesF16x8, &Literal::sqrt, &toFP16>(*this);
+}
+Literal Literal::ceilF16x8() const {
+ return unary<8, &Literal::getLanesF16x8, &Literal::ceil, &toFP16>(*this);
+}
+Literal Literal::floorF16x8() const {
+ return unary<8, &Literal::getLanesF16x8, &Literal::floor, &toFP16>(*this);
+}
+Literal Literal::truncF16x8() const {
+ return unary<8, &Literal::getLanesF16x8, &Literal::trunc, &toFP16>(*this);
+}
+Literal Literal::nearestF16x8() const {
+ return unary<8, &Literal::getLanesF16x8, &Literal::nearbyint, &toFP16>(*this);
+}
Literal Literal::absF32x4() const {
return unary<4, &Literal::getLanesF32x4, &Literal::abs>(*this);
}
@@ -2271,11 +2298,6 @@ Literal Literal::geF64x2(const Literal& other) const {
other);
}
-static Literal passThrough(const Literal& literal) { return literal; }
-static Literal toFP16(const Literal& literal) {
- return literal.convertF32ToF16();
-}
-
template<int Lanes,
LaneArray<Lanes> (Literal::*IntoLanes)() const,
Literal (Literal::*BinaryOp)(const Literal&) const,
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index 06d17fdfb..16a926182 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -6439,6 +6439,34 @@ bool WasmBinaryReader::maybeVisitSIMDUnary(Expression*& out, uint32_t code) {
curr = allocator.alloc<Unary>();
curr->op = BitmaskVecI64x2;
break;
+ case BinaryConsts::F16x8Abs:
+ curr = allocator.alloc<Unary>();
+ curr->op = AbsVecF16x8;
+ break;
+ case BinaryConsts::F16x8Neg:
+ curr = allocator.alloc<Unary>();
+ curr->op = NegVecF16x8;
+ break;
+ case BinaryConsts::F16x8Sqrt:
+ curr = allocator.alloc<Unary>();
+ curr->op = SqrtVecF16x8;
+ break;
+ case BinaryConsts::F16x8Ceil:
+ curr = allocator.alloc<Unary>();
+ curr->op = CeilVecF16x8;
+ break;
+ case BinaryConsts::F16x8Floor:
+ curr = allocator.alloc<Unary>();
+ curr->op = FloorVecF16x8;
+ break;
+ case BinaryConsts::F16x8Trunc:
+ curr = allocator.alloc<Unary>();
+ curr->op = TruncVecF16x8;
+ break;
+ case BinaryConsts::F16x8Nearest:
+ curr = allocator.alloc<Unary>();
+ curr->op = NearestVecF16x8;
+ break;
case BinaryConsts::F32x4Abs:
curr = allocator.alloc<Unary>();
curr->op = AbsVecF32x4;
diff --git a/src/wasm/wasm-stack.cpp b/src/wasm/wasm-stack.cpp
index b7bfea617..59593ddde 100644
--- a/src/wasm/wasm-stack.cpp
+++ b/src/wasm/wasm-stack.cpp
@@ -1132,6 +1132,28 @@ void BinaryInstWriter::visitUnary(Unary* curr) {
o << int8_t(BinaryConsts::SIMDPrefix)
<< U32LEB(BinaryConsts::I64x2Bitmask);
break;
+ case AbsVecF16x8:
+ o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::F16x8Abs);
+ break;
+ case NegVecF16x8:
+ o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::F16x8Neg);
+ break;
+ case SqrtVecF16x8:
+ o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::F16x8Sqrt);
+ break;
+ case CeilVecF16x8:
+ o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::F16x8Ceil);
+ break;
+ case FloorVecF16x8:
+ o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::F16x8Floor);
+ break;
+ case TruncVecF16x8:
+ o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::F16x8Trunc);
+ break;
+ case NearestVecF16x8:
+ o << int8_t(BinaryConsts::SIMDPrefix)
+ << U32LEB(BinaryConsts::F16x8Nearest);
+ break;
case AbsVecF32x4:
o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::F32x4Abs);
break;
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
index f77eeefe7..40726d7cd 100644
--- a/src/wasm/wasm-validator.cpp
+++ b/src/wasm/wasm-validator.cpp
@@ -2095,6 +2095,17 @@ void FunctionValidator::visitUnary(Unary* curr) {
shouldBeEqual(
curr->value->type, Type(Type::f64), curr, "expected f64 splat value");
break;
+ case AbsVecF16x8:
+ case NegVecF16x8:
+ case SqrtVecF16x8:
+ case CeilVecF16x8:
+ case FloorVecF16x8:
+ case TruncVecF16x8:
+ case NearestVecF16x8:
+ shouldBeTrue(getModule()->features.hasFP16(),
+ curr,
+ "FP16 operations require FP16 [--enable-fp16]");
+ [[fallthrough]];
case NotVec128:
case PopcntVecI8x16:
case AbsVecI8x16:
diff --git a/src/wasm/wasm.cpp b/src/wasm/wasm.cpp
index e768f0dc4..98146dfbc 100644
--- a/src/wasm/wasm.cpp
+++ b/src/wasm/wasm.cpp
@@ -652,6 +652,13 @@ void Unary::finalize() {
case NegVecI16x8:
case NegVecI32x4:
case NegVecI64x2:
+ case AbsVecF16x8:
+ case NegVecF16x8:
+ case SqrtVecF16x8:
+ case CeilVecF16x8:
+ case FloorVecF16x8:
+ case TruncVecF16x8:
+ case NearestVecF16x8:
case AbsVecF32x4:
case NegVecF32x4:
case SqrtVecF32x4:
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-05 07:32:36 +0000