Skip to content

Commit 1376ba0

Browse files
rossbergrossberg
committed
[spec] Tweak some layout
1 parent 1b2b34a commit 1376ba0

8 files changed

Lines changed: 447 additions & 439 deletions

File tree

‎document/core/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ clean:
134134
rm -rf $(SPLICEDIR)
135135
rm -rf $(BUILDDIR)
136136
rm -rf $(STATICDIR)
137+
rm -rf $(SPLICEDIR)
137138
rm -f $(GENERATED)
138139

139140
.PHONY: html html-nested

‎document/core/syntax/instructions.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,8 @@ Instructions prefixed with ${:V128} do not involve a specific interpretation, an
407407

408408
$${syntax:
409409
vvunop vvbinop vvternop vvtestop
410-
vunop_ vbinop_ vternop_ vtestop_ vrelop_ vswizzlop_ vshiftop_ vextunop__ vextbinop__ vextternop__ vcvtop__
410+
vunop_ vbinop_ vternop_ vtestop_ vrelop_ vswizzlop_ vshiftop_
411+
vextunop__ vextbinop__ vextternop__ vcvtop__
411412
}
412413

413414
Vector instructions can be grouped into several subcategories:

‎specification/wasm-3.0/1.3-syntax.instructions.spectec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ syntax vvtestop hint(macro "%" "V%") = ANY_TRUE
102102
syntax vunop_(shape) hint(macro "%" "V%")
103103
syntax vunop_(Jnn X M) = ABS | NEG
104104
| POPCNT -- if $lsizenn(Jnn) = `8
105-
syntax vunop_(Fnn X M) = ABS | NEG | SQRT | CEIL | FLOOR | TRUNC | NEAREST
105+
syntax vunop_(Fnn X M) = ABS | NEG | SQRT
106+
| CEIL | FLOOR | TRUNC | NEAREST
106107

107108
syntax vbinop_(shape) hint(macro "%" "V%")
108109
syntax vbinop_(Jnn X M) =
@@ -116,7 +117,8 @@ syntax vbinop_(Jnn X M) =
116117
| RELAXED_Q15MULR S hint(show RELAXED_Q15MULR#_#%) -- if $lsizenn(Jnn) = `16
117118
| MIN sx hint(show MIN#_#%) -- if $lsizenn(Jnn) <= `32
118119
| MAX sx hint(show MAX#_#%) -- if $lsizenn(Jnn) <= `32
119-
syntax vbinop_(Fnn X M) = ADD | SUB | MUL | DIV | MIN | MAX | PMIN | PMAX
120+
syntax vbinop_(Fnn X M) = ADD | SUB | MUL | DIV
121+
| MIN | MAX | PMIN | PMAX
120122
| RELAXED_MIN | RELAXED_MAX
121123

122124
syntax vternop_(shape) hint(macro "%" "V%")

‎specification/wasm-latest/1.3-syntax.instructions.spectec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ syntax vvtestop hint(macro "%" "V%") = ANY_TRUE
102102
syntax vunop_(shape) hint(macro "%" "V%")
103103
syntax vunop_(Jnn X M) = ABS | NEG
104104
| POPCNT -- if $lsizenn(Jnn) = `8
105-
syntax vunop_(Fnn X M) = ABS | NEG | SQRT | CEIL | FLOOR | TRUNC | NEAREST
105+
syntax vunop_(Fnn X M) = ABS | NEG | SQRT
106+
| CEIL | FLOOR | TRUNC | NEAREST
106107

107108
syntax vbinop_(shape) hint(macro "%" "V%")
108109
syntax vbinop_(Jnn X M) =
@@ -116,7 +117,8 @@ syntax vbinop_(Jnn X M) =
116117
| RELAXED_Q15MULR S hint(show RELAXED_Q15MULR#_#%) -- if $lsizenn(Jnn) = `16
117118
| MIN sx hint(show MIN#_#%) -- if $lsizenn(Jnn) <= `32
118119
| MAX sx hint(show MAX#_#%) -- if $lsizenn(Jnn) <= `32
119-
syntax vbinop_(Fnn X M) = ADD | SUB | MUL | DIV | MIN | MAX | PMIN | PMAX
120+
syntax vbinop_(Fnn X M) = ADD | SUB | MUL | DIV
121+
| MIN | MAX | PMIN | PMAX
120122
| RELAXED_MIN | RELAXED_MAX
121123

122124
syntax vternop_(shape) hint(macro "%" "V%")

‎spectec/doc/example/output/NanoWasm.pdf‎

0 Bytes
Binary file not shown.

‎spectec/test-frontend/TEST.md‎

Lines changed: 108 additions & 108 deletions
Large diffs are not rendered by default.

‎spectec/test-latex/TEST.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3785,7 +3785,8 @@ $$
37853785
\begin{array}[t]{@{}lrrl@{}l@{}}
37863786
& {{\mathit{vunop}}}_{{{\mathsf{i}}{N}}{\mathsf{x}}{M}} & ::= & \mathsf{abs} ~~|~~ \mathsf{neg} \\
37873787
& & | & \mathsf{popcnt} & \quad \mbox{if}~ N = \mathsf{{\scriptstyle 8}} \\
3788-
& {{\mathit{vunop}}}_{{{\mathsf{f}}{N}}{\mathsf{x}}{M}} & ::= & \mathsf{abs} ~~|~~ \mathsf{neg} ~~|~~ \mathsf{sqrt} ~~|~~ \mathsf{ceil} ~~|~~ \mathsf{floor} ~~|~~ \mathsf{trunc} ~~|~~ \mathsf{nearest} \\
3788+
& {{\mathit{vunop}}}_{{{\mathsf{f}}{N}}{\mathsf{x}}{M}} & ::= & \mathsf{abs} ~~|~~ \mathsf{neg} ~~|~~ \mathsf{sqrt} \\
3789+
& & | & \mathsf{ceil} ~~|~~ \mathsf{floor} ~~|~~ \mathsf{trunc} ~~|~~ \mathsf{nearest} \\
37893790
\end{array}
37903791
$$
37913792

@@ -3801,7 +3802,8 @@ $$
38013802
& & | & {\mathsf{relaxed\_q{\scriptstyle 15}mulr}}{\mathsf{\_}}{\mathsf{s}} & \quad \mbox{if}~ N = \mathsf{{\scriptstyle 16}} \\
38023803
& & | & {\mathsf{min}}{\mathsf{\_}}{{\mathit{sx}}} & \quad \mbox{if}~ N \leq \mathsf{{\scriptstyle 32}} \\
38033804
& & | & {\mathsf{max}}{\mathsf{\_}}{{\mathit{sx}}} & \quad \mbox{if}~ N \leq \mathsf{{\scriptstyle 32}} \\
3804-
& {{\mathit{vbinop}}}_{{{\mathsf{f}}{N}}{\mathsf{x}}{M}} & ::= & \mathsf{add} ~~|~~ \mathsf{sub} ~~|~~ \mathsf{mul} ~~|~~ \mathsf{div} ~~|~~ \mathsf{min} ~~|~~ \mathsf{max} ~~|~~ \mathsf{pmin} ~~|~~ \mathsf{pmax} \\
3805+
& {{\mathit{vbinop}}}_{{{\mathsf{f}}{N}}{\mathsf{x}}{M}} & ::= & \mathsf{add} ~~|~~ \mathsf{sub} ~~|~~ \mathsf{mul} ~~|~~ \mathsf{div} \\
3806+
& & | & \mathsf{min} ~~|~~ \mathsf{max} ~~|~~ \mathsf{pmin} ~~|~~ \mathsf{pmax} \\
38053807
& & | & \mathsf{relaxed\_min} ~~|~~ \mathsf{relaxed\_max} \\
38063808
\end{array}
38073809
$$

‎spectec/test-middlend/TEST.md‎

Lines changed: 324 additions & 324 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)