Rename relaxed SIMD fma instructions to match spec. (#6876)

The instructions relaxed_fma and relaxed_fnma have been renamed to
relaxed_madd and relaxed_nmadd.


https://github.com/WebAssembly/relaxed-simd/blob/main/proposals/relaxed-simd/Overview.md#binary-format

3 files changed, 36 insertions, 36 deletions

diff --git a/test/example/c-api-kitchen-sink.c b/test/example/c-api-kitchen-sink.c
index 802789173..d3f20e888 100644
--- a/test/example/c-api-kitchen-sink.c
+++ b/test/example/c-api-kitchen-sink.c
@@ -956,10 +956,10 @@ void test_core() {
     // Other SIMD
     makeSIMDShuffle(module),
     makeSIMDTernary(module, BinaryenBitselectVec128()),
-    makeSIMDTernary(module, BinaryenRelaxedFmaVecF32x4()),
-    makeSIMDTernary(module, BinaryenRelaxedFmsVecF32x4()),
-    makeSIMDTernary(module, BinaryenRelaxedFmaVecF64x2()),
-    makeSIMDTernary(module, BinaryenRelaxedFmsVecF64x2()),
+    makeSIMDTernary(module, BinaryenRelaxedMaddVecF32x4()),
+    makeSIMDTernary(module, BinaryenRelaxedNmaddVecF32x4()),
+    makeSIMDTernary(module, BinaryenRelaxedMaddVecF64x2()),
+    makeSIMDTernary(module, BinaryenRelaxedNmaddVecF64x2()),
     makeSIMDTernary(module, BinaryenLaneselectI8x16()),
     makeSIMDTernary(module, BinaryenLaneselectI16x8()),
     makeSIMDTernary(module, BinaryenLaneselectI32x4()),
diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
index 17344ccab..f1271f547 100644
--- a/test/example/c-api-kitchen-sink.txt
+++ b/test/example/c-api-kitchen-sink.txt
@@ -1884,28 +1884,28 @@ BinaryenFeatureAll: 524287
        )
       )
       (drop
-       (f32x4.relaxed_fma
+       (f32x4.relaxed_madd
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
        )
       )
       (drop
-       (f32x4.relaxed_fms
+       (f32x4.relaxed_nmadd
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
        )
       )
       (drop
-       (f64x2.relaxed_fma
+       (f64x2.relaxed_madd
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
        )
       )
       (drop
-       (f64x2.relaxed_fms
+       (f64x2.relaxed_nmadd
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
         (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d)
diff --git a/test/lit/basic/relaxed-simd.wast b/test/lit/basic/relaxed-simd.wast
index 0024d5b93..1624d18b4 100644
--- a/test/lit/basic/relaxed-simd.wast
+++ b/test/lit/basic/relaxed-simd.wast
@@ -111,88 +111,88 @@
   )
  )
 
- ;; CHECK-TEXT:      (func $f32x4.relaxed_fma (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
- ;; CHECK-TEXT-NEXT:  (f32x4.relaxed_fma
+ ;; CHECK-TEXT:      (func $f32x4.relaxed_madd (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+ ;; CHECK-TEXT-NEXT:  (f32x4.relaxed_madd
  ;; CHECK-TEXT-NEXT:   (local.get $0)
  ;; CHECK-TEXT-NEXT:   (local.get $1)
  ;; CHECK-TEXT-NEXT:   (local.get $2)
  ;; CHECK-TEXT-NEXT:  )
  ;; CHECK-TEXT-NEXT: )
- ;; CHECK-BIN:      (func $f32x4.relaxed_fma (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
- ;; CHECK-BIN-NEXT:  (f32x4.relaxed_fma
+ ;; CHECK-BIN:      (func $f32x4.relaxed_madd (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+ ;; CHECK-BIN-NEXT:  (f32x4.relaxed_madd
  ;; CHECK-BIN-NEXT:   (local.get $0)
  ;; CHECK-BIN-NEXT:   (local.get $1)
  ;; CHECK-BIN-NEXT:   (local.get $2)
  ;; CHECK-BIN-NEXT:  )
  ;; CHECK-BIN-NEXT: )
- (func $f32x4.relaxed_fma (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
-  (f32x4.relaxed_fma
+ (func $f32x4.relaxed_madd (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+  (f32x4.relaxed_madd
    (local.get $0)
    (local.get $1)
    (local.get $2)
   )
  )
 
- ;; CHECK-TEXT:      (func $f32x4.relaxed_fms (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
- ;; CHECK-TEXT-NEXT:  (f32x4.relaxed_fms
+ ;; CHECK-TEXT:      (func $f32x4.relaxed_nmadd (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+ ;; CHECK-TEXT-NEXT:  (f32x4.relaxed_nmadd
  ;; CHECK-TEXT-NEXT:   (local.get $0)
  ;; CHECK-TEXT-NEXT:   (local.get $1)
  ;; CHECK-TEXT-NEXT:   (local.get $2)
  ;; CHECK-TEXT-NEXT:  )
  ;; CHECK-TEXT-NEXT: )
- ;; CHECK-BIN:      (func $f32x4.relaxed_fms (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
- ;; CHECK-BIN-NEXT:  (f32x4.relaxed_fms
+ ;; CHECK-BIN:      (func $f32x4.relaxed_nmadd (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+ ;; CHECK-BIN-NEXT:  (f32x4.relaxed_nmadd
  ;; CHECK-BIN-NEXT:   (local.get $0)
  ;; CHECK-BIN-NEXT:   (local.get $1)
  ;; CHECK-BIN-NEXT:   (local.get $2)
  ;; CHECK-BIN-NEXT:  )
  ;; CHECK-BIN-NEXT: )
- (func $f32x4.relaxed_fms (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
-  (f32x4.relaxed_fms
+ (func $f32x4.relaxed_nmadd (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+  (f32x4.relaxed_nmadd
    (local.get $0)
    (local.get $1)
    (local.get $2)
   )
  )
 
- ;; CHECK-TEXT:      (func $f64x2.relaxed_fma (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
- ;; CHECK-TEXT-NEXT:  (f64x2.relaxed_fma
+ ;; CHECK-TEXT:      (func $f64x2.relaxed_madd (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+ ;; CHECK-TEXT-NEXT:  (f64x2.relaxed_madd
  ;; CHECK-TEXT-NEXT:   (local.get $0)
  ;; CHECK-TEXT-NEXT:   (local.get $1)
  ;; CHECK-TEXT-NEXT:   (local.get $2)
  ;; CHECK-TEXT-NEXT:  )
  ;; CHECK-TEXT-NEXT: )
- ;; CHECK-BIN:      (func $f64x2.relaxed_fma (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
- ;; CHECK-BIN-NEXT:  (f64x2.relaxed_fma
+ ;; CHECK-BIN:      (func $f64x2.relaxed_madd (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+ ;; CHECK-BIN-NEXT:  (f64x2.relaxed_madd
  ;; CHECK-BIN-NEXT:   (local.get $0)
  ;; CHECK-BIN-NEXT:   (local.get $1)
  ;; CHECK-BIN-NEXT:   (local.get $2)
  ;; CHECK-BIN-NEXT:  )
  ;; CHECK-BIN-NEXT: )
- (func $f64x2.relaxed_fma (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
-  (f64x2.relaxed_fma
+ (func $f64x2.relaxed_madd (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+  (f64x2.relaxed_madd
    (local.get $0)
    (local.get $1)
    (local.get $2)
   )
  )
 
- ;; CHECK-TEXT:      (func $f64x2.relaxed_fms (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
- ;; CHECK-TEXT-NEXT:  (f64x2.relaxed_fms
+ ;; CHECK-TEXT:      (func $f64x2.relaxed_nmadd (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+ ;; CHECK-TEXT-NEXT:  (f64x2.relaxed_nmadd
  ;; CHECK-TEXT-NEXT:   (local.get $0)
  ;; CHECK-TEXT-NEXT:   (local.get $1)
  ;; CHECK-TEXT-NEXT:   (local.get $2)
  ;; CHECK-TEXT-NEXT:  )
  ;; CHECK-TEXT-NEXT: )
- ;; CHECK-BIN:      (func $f64x2.relaxed_fms (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
- ;; CHECK-BIN-NEXT:  (f64x2.relaxed_fms
+ ;; CHECK-BIN:      (func $f64x2.relaxed_nmadd (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+ ;; CHECK-BIN-NEXT:  (f64x2.relaxed_nmadd
  ;; CHECK-BIN-NEXT:   (local.get $0)
  ;; CHECK-BIN-NEXT:   (local.get $1)
  ;; CHECK-BIN-NEXT:   (local.get $2)
  ;; CHECK-BIN-NEXT:  )
  ;; CHECK-BIN-NEXT: )
- (func $f64x2.relaxed_fms (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
-  (f64x2.relaxed_fms
+ (func $f64x2.relaxed_nmadd (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
+  (f64x2.relaxed_nmadd
    (local.get $0)
    (local.get $1)
    (local.get $2)
@@ -463,7 +463,7 @@
 ;; CHECK-BIN-NODEBUG-NEXT: )
 
 ;; CHECK-BIN-NODEBUG:      (func $5 (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
-;; CHECK-BIN-NODEBUG-NEXT:  (f32x4.relaxed_fma
+;; CHECK-BIN-NODEBUG-NEXT:  (f32x4.relaxed_madd
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $0)
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $1)
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $2)
@@ -471,7 +471,7 @@
 ;; CHECK-BIN-NODEBUG-NEXT: )
 
 ;; CHECK-BIN-NODEBUG:      (func $6 (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
-;; CHECK-BIN-NODEBUG-NEXT:  (f32x4.relaxed_fms
+;; CHECK-BIN-NODEBUG-NEXT:  (f32x4.relaxed_nmadd
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $0)
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $1)
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $2)
@@ -479,7 +479,7 @@
 ;; CHECK-BIN-NODEBUG-NEXT: )
 
 ;; CHECK-BIN-NODEBUG:      (func $7 (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
-;; CHECK-BIN-NODEBUG-NEXT:  (f64x2.relaxed_fma
+;; CHECK-BIN-NODEBUG-NEXT:  (f64x2.relaxed_madd
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $0)
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $1)
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $2)
@@ -487,7 +487,7 @@
 ;; CHECK-BIN-NODEBUG-NEXT: )
 
 ;; CHECK-BIN-NODEBUG:      (func $8 (type $0) (param $0 v128) (param $1 v128) (param $2 v128) (result v128)
-;; CHECK-BIN-NODEBUG-NEXT:  (f64x2.relaxed_fms
+;; CHECK-BIN-NODEBUG-NEXT:  (f64x2.relaxed_nmadd
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $0)
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $1)
 ;; CHECK-BIN-NODEBUG-NEXT:   (local.get $2)