Skip to content

Validate remaining FP16 instruction features #8979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ANAMASGARD wants to merge 1 commit into
base: main
Choose a base branch
from
+59 −7
Open

Validate remaining FP16 instruction features #8979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/wasm/wasm-validator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,11 @@ void FunctionValidator::visitLoad(Load* curr) {
curr,
"SIMD operations require SIMD [--enable-simd]");
}
if (curr->type == Type::f32 && curr->bytes == 2) {
shouldBeTrue(getModule()->features.hasFP16(),
curr,
"FP16 operations require FP16 [--enable-fp16]");
}
validateMemBytes(curr->bytes, curr->type, curr);
validateOffset(curr->offset, memory, curr);
validateAlignment(
Expand Down Expand Up @@ -1280,6 +1285,11 @@ void FunctionValidator::visitStore(Store* curr) {
curr,
"SIMD operations require SIMD [--enable-simd]");
}
if (curr->valueType == Type::f32 && curr->bytes == 2) {
shouldBeTrue(getModule()->features.hasFP16(),
curr,
"FP16 operations require FP16 [--enable-fp16]");
}
validateMemBytes(curr->bytes, curr->valueType, curr);
validateOffset(curr->offset, memory, curr);
validateAlignment(
Expand Down Expand Up @@ -2341,6 +2351,13 @@ void FunctionValidator::visitUnary(Unary* curr) {
case FloorVecF16x8:
case TruncVecF16x8:
case NearestVecF16x8:
case PromoteLowVecF16x8ToVecF32x4:
case DemoteZeroVecF32x4ToVecF16x8:
case DemoteZeroVecF64x2ToVecF16x8:
case TruncSatSVecF16x8ToVecI16x8:
case TruncSatUVecF16x8ToVecI16x8:
case ConvertSVecI16x8ToVecF16x8:
case ConvertUVecI16x8ToVecF16x8:
shouldBeTrue(getModule()->features.hasFP16(),
curr,
"FP16 operations require FP16 [--enable-fp16]");
Expand Down Expand Up @@ -2395,17 +2412,10 @@ void FunctionValidator::visitUnary(Unary* curr) {
case TruncSatZeroUVecF64x2ToVecI32x4:
case DemoteZeroVecF64x2ToVecF32x4:
case PromoteLowVecF32x4ToVecF64x2:
case PromoteLowVecF16x8ToVecF32x4:
case DemoteZeroVecF32x4ToVecF16x8:
case DemoteZeroVecF64x2ToVecF16x8:
case RelaxedTruncSVecF32x4ToVecI32x4:
case RelaxedTruncUVecF32x4ToVecI32x4:
case RelaxedTruncZeroSVecF64x2ToVecI32x4:
case RelaxedTruncZeroUVecF64x2ToVecI32x4:
case TruncSatSVecF16x8ToVecI16x8:
case TruncSatUVecF16x8ToVecI16x8:
case ConvertSVecI16x8ToVecF16x8:
case ConvertUVecI16x8ToVecF16x8:
shouldBeEqual(curr->type, Type(Type::v128), curr, "expected v128 type");
shouldBeEqual(
curr->value->type, Type(Type::v128), curr, "expected v128 operand");
Expand Down
12 changes: 12 additions & 0 deletions test/lit/validation/fp16-memory.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
;; RUN: foreach %s %t not wasm-opt 2>&1 | filecheck %s
;; RUN: foreach %s %t wasm-opt --enable-fp16 -o /dev/null

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module
(memory 1)
(func (result f32) (f32.load_f16 (i32.const 0))))

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module
(memory 1)
(func (param f32) (f32.store_f16 (i32.const 0) (local.get 0))))
30 changes: 30 additions & 0 deletions test/lit/validation/fp16-unary.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
;; RUN: foreach %s %t not wasm-opt --enable-simd 2>&1 | filecheck %s
;; RUN: foreach %s %t wasm-opt --enable-simd --enable-fp16 -o /dev/null

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module (func (param v128) (result v128)
(f32x4.promote_low_f16x8 (local.get 0))))

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module (func (param v128) (result v128)
(f16x8.demote_f32x4_zero (local.get 0))))

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module (func (param v128) (result v128)
(f16x8.demote_f64x2_zero (local.get 0))))

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module (func (param v128) (result v128)
(i16x8.trunc_sat_f16x8_s (local.get 0))))

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module (func (param v128) (result v128)
(i16x8.trunc_sat_f16x8_u (local.get 0))))

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module (func (param v128) (result v128)
(f16x8.convert_i16x8_s (local.get 0))))

;; CHECK: FP16 operations require FP16 [--enable-fp16]
(module (func (param v128) (result v128)
(f16x8.convert_i16x8_u (local.get 0))))