Fix binopVIXX

kaist-plrg · Feb 5, 2024 · 678f9d0 · 678f9d0
1 parent aef8600
commit 678f9d0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/spectec/spec/wasm-2.0/1-syntax.watsup b/spectec/spec/wasm-2.0/1-syntax.watsup
@@ -203,7 +203,7 @@ syntax testopVIXX = | ALL_TRUE
 syntax relopVIXX = | EQ | NE | LT sx | GT sx | LE sx | GE sx
 syntax relopVFXX = | EQ | NE | LT | GT | LE | GE
 syntax unopVIXX = | ABS | NEG
-syntax binopVIXX = | ADD | SUB | SWIZZLE
+syntax binopVIXX = | ADD | SUB
 syntax minmaxopVIXX = | MIN sx | MAX sx
 syntax satbinopVIXX = | ADD_SAT sx | SUB_SAT sx
 syntax shiftopVIXX = | SHL | SHR sx

diff --git a/spectec/spec/wasm-3.0/1-syntax.watsup b/spectec/spec/wasm-3.0/1-syntax.watsup
@@ -264,7 +264,7 @@ syntax testopVIXX = | ALL_TRUE
 syntax relopVIXX = | EQ | NE | LT sx | GT sx | LE sx | GE sx
 syntax relopVFXX = | EQ | NE | LT | GT | LE | GE
 syntax unopVIXX = | ABS | NEG
-syntax binopVIXX = | ADD | SUB | SWIZZLE
+syntax binopVIXX = | ADD | SUB
 syntax minmaxopVIXX = | MIN sx | MAX sx
 syntax satbinopVIXX = | ADD_SAT sx | SUB_SAT sx
 syntax shiftopVIXX = | SHL | SHR sx

diff --git a/spectec/test-frontend/TEST.md b/spectec/test-frontend/TEST.md
@@ -595,11 +595,10 @@ syntax unopVIXX =
   | ABS
   | NEG
 
-;; 1-syntax.watsup:267.1-267.41
+;; 1-syntax.watsup:267.1-267.31
 syntax binopVIXX =
   | ADD
   | SUB
-  | SWIZZLE
 
 ;; 1-syntax.watsup:268.1-268.40
 syntax minmaxopVIXX =
@@ -647,7 +646,6 @@ syntax viunop =
 syntax vibinop =
   | ADD
   | SUB
-  | SWIZZLE
   | MIN(sx)
   | MAX(sx)
   | ADD_SAT(sx)

diff --git a/spectec/test-latex/TEST.md b/spectec/test-latex/TEST.md
@@ -278,7 +278,7 @@ $$
 & {\mathit{relopVIXX}} &::=& \mathsf{eq} ~|~ \mathsf{ne} ~|~ {\mathsf{lt\_}}{{\mathit{sx}}} ~|~ {\mathsf{gt\_}}{{\mathit{sx}}} ~|~ {\mathsf{le\_}}{{\mathit{sx}}} ~|~ {\mathsf{ge\_}}{{\mathit{sx}}} \\
 & {\mathit{relopVFXX}} &::=& \mathsf{eq} ~|~ \mathsf{ne} ~|~ \mathsf{lt} ~|~ \mathsf{gt} ~|~ \mathsf{le} ~|~ \mathsf{ge} \\
 & {\mathit{unopVIXX}} &::=& \mathsf{abs} ~|~ \mathsf{neg} \\
-& {\mathit{binopVIXX}} &::=& \mathsf{add} ~|~ \mathsf{sub} ~|~ \mathsf{swizzle} \\
+& {\mathit{binopVIXX}} &::=& \mathsf{add} ~|~ \mathsf{sub} \\
 & {\mathit{minmaxopVIXX}} &::=& \mathsf{min}~{\mathit{sx}} ~|~ \mathsf{max}~{\mathit{sx}} \\
 & {\mathit{satbinopVIXX}} &::=& \mathsf{add\_sat}~{\mathit{sx}} ~|~ \mathsf{sub\_sat}~{\mathit{sx}} \\
 & {\mathit{shiftopVIXX}} &::=& \mathsf{shl} ~|~ {\mathsf{shr\_}}{{\mathit{sx}}} \\

diff --git a/spectec/test-middlend/TEST.md b/spectec/test-middlend/TEST.md
@@ -458,11 +458,10 @@ syntax unopVIXX =
   | ABS
   | NEG
 
-;; 1-syntax.watsup:267.1-267.41
+;; 1-syntax.watsup:267.1-267.31
 syntax binopVIXX =
   | ADD
   | SUB
-  | SWIZZLE
 
 ;; 1-syntax.watsup:268.1-268.40
 syntax minmaxopVIXX =
@@ -510,7 +509,6 @@ syntax viunop =
 syntax vibinop =
   | ADD
   | SUB
-  | SWIZZLE
   | MIN(sx)
   | MAX(sx)
   | ADD_SAT(sx)
@@ -5217,11 +5215,10 @@ syntax unopVIXX =
   | ABS
   | NEG
 
-;; 1-syntax.watsup:267.1-267.41
+;; 1-syntax.watsup:267.1-267.31
 syntax binopVIXX =
   | ADD
   | SUB
-  | SWIZZLE
 
 ;; 1-syntax.watsup:268.1-268.40
 syntax minmaxopVIXX =
@@ -5269,7 +5266,6 @@ syntax viunop =
 syntax vibinop =
   | ADD
   | SUB
-  | SWIZZLE
   | MIN(sx)
   | MAX(sx)
   | ADD_SAT(sx)
@@ -10141,11 +10137,10 @@ syntax unopVIXX =
   | ABS
   | NEG
 
-;; 1-syntax.watsup:267.1-267.41
+;; 1-syntax.watsup:267.1-267.31
 syntax binopVIXX =
   | ADD
   | SUB
-  | SWIZZLE
 
 ;; 1-syntax.watsup:268.1-268.40
 syntax minmaxopVIXX =
@@ -10193,7 +10188,6 @@ syntax viunop =
 syntax vibinop =
   | ADD
   | SUB
-  | SWIZZLE
   | MIN(sx)
   | MAX(sx)
   | ADD_SAT(sx)
@@ -15068,11 +15062,10 @@ syntax unopVIXX =
   | ABS
   | NEG
 
-;; 1-syntax.watsup:267.1-267.41
+;; 1-syntax.watsup:267.1-267.31
 syntax binopVIXX =
   | ADD
   | SUB
-  | SWIZZLE
 
 ;; 1-syntax.watsup:268.1-268.40
 syntax minmaxopVIXX =
@@ -15120,7 +15113,6 @@ syntax viunop =
 syntax vibinop =
   | ADD
   | SUB
-  | SWIZZLE
   | MIN(sx)
   | MAX(sx)
   | ADD_SAT(sx)
@@ -20020,11 +20012,10 @@ syntax unopVIXX =
   | ABS
   | NEG
 
-;; 1-syntax.watsup:267.1-267.41
+;; 1-syntax.watsup:267.1-267.31
 syntax binopVIXX =
   | ADD
   | SUB
-  | SWIZZLE
 
 ;; 1-syntax.watsup:268.1-268.40
 syntax minmaxopVIXX =
@@ -20072,7 +20063,6 @@ syntax viunop =
 syntax vibinop =
   | ADD
   | SUB
-  | SWIZZLE
   | MIN(sx)
   | MAX(sx)
   | ADD_SAT(sx)
@@ -24972,11 +24962,10 @@ syntax unopVIXX =
   | ABS
   | NEG
 
-;; 1-syntax.watsup:267.1-267.41
+;; 1-syntax.watsup:267.1-267.31
 syntax binopVIXX =
   | ADD
   | SUB
-  | SWIZZLE
 
 ;; 1-syntax.watsup:268.1-268.40
 syntax minmaxopVIXX =
@@ -25024,7 +25013,6 @@ syntax viunop =
 syntax vibinop =
   | ADD
   | SUB
-  | SWIZZLE
   | MIN(sx)
   | MAX(sx)
   | ADD_SAT(sx)
@@ -30078,11 +30066,10 @@ syntax unopVIXX =
   | ABS
   | NEG
 
-;; 1-syntax.watsup:267.1-267.41
+;; 1-syntax.watsup:267.1-267.31
 syntax binopVIXX =
   | ADD
   | SUB
-  | SWIZZLE
 
 ;; 1-syntax.watsup:268.1-268.40
 syntax minmaxopVIXX =
@@ -30130,7 +30117,6 @@ syntax viunop =
 syntax vibinop =
   | ADD
   | SUB
-  | SWIZZLE
   | MIN(sx)
   | MAX(sx)
   | ADD_SAT(sx)