Skip to content

Commit 412b998

Browse files
MikeHolmanMikeHolman
committed
add missing serialization layouts; disable forceserialized from some UTs
1 parent 2e4f40a commit 412b998

File tree

11 files changed

+30
-11
lines changed

11 files changed

+30
-11
lines changed

‎lib/Runtime/ByteCode/ByteCodeSerializer.cpp‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ class ByteCodeBufferBuilder
790790
opStart = reader.GetIP();
791791
opStart; // For prefast. It can't figure out that opStart is captured in saveBlock above.
792792
LayoutSize layoutSize;
793-
OpCodeAsmJs op = (OpCodeAsmJs)reader.ReadOp(layoutSize);
793+
OpCodeAsmJs op = reader.ReadAsmJsOp(layoutSize);
794794
if (op == OpCodeAsmJs::EndOfBlock)
795795
{
796796
saveBlock();
@@ -868,13 +868,18 @@ class ByteCodeBufferBuilder
868868
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_2);
869869
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_3);
870870
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_4);
871-
DEFAULT_LAYOUT_WITH_ONEBYTE(Bool32x4_1Float32x4_2)
872-
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Bool32x4_1Float32x4_2)
871+
DEFAULT_LAYOUT_WITH_ONEBYTE(Bool32x4_1Float32x4_2);
872+
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Bool32x4_1Float32x4_2);
873873
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Float4);
874874
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_2Int4);
875875
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_3Int4);
876876
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Float1);
877877
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_2Float1);
878+
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Int16x8_1);
879+
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Int8x16_1);
880+
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Uint8x16_1);
881+
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Uint32x4_1);
882+
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Uint16x8_1);
878883
//DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Float64x2_1);
879884
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_1Int32x4_1);
880885
DEFAULT_LAYOUT_WITH_ONEBYTE(Reg1Float32x4_1);
@@ -889,6 +894,11 @@ class ByteCodeBufferBuilder
889894
DEFAULT_LAYOUT_WITH_ONEBYTE(Int32x4_3Int4);
890895
DEFAULT_LAYOUT_WITH_ONEBYTE(Int32x4_2Int1);
891896
DEFAULT_LAYOUT_WITH_ONEBYTE(Int32x4_2Int2);
897+
DEFAULT_LAYOUT_WITH_ONEBYTE(Int32x4_1Int8x16_1);
898+
DEFAULT_LAYOUT_WITH_ONEBYTE(Int32x4_1Int16x8_1);
899+
DEFAULT_LAYOUT_WITH_ONEBYTE(Int32x4_1Uint8x16_1);
900+
DEFAULT_LAYOUT_WITH_ONEBYTE(Int32x4_1Uint16x8_1);
901+
DEFAULT_LAYOUT_WITH_ONEBYTE(Int32x4_1Uint32x4_1);
892902
DEFAULT_LAYOUT_WITH_ONEBYTE(Int1Int32x4_1Int1);
893903
DEFAULT_LAYOUT_WITH_ONEBYTE(Float32x4_2Int1Float1);
894904
DEFAULT_LAYOUT_WITH_ONEBYTE(Float1Float32x4_1Int1);
@@ -1182,6 +1192,8 @@ class ByteCodeBufferBuilder
11821192
DEFAULT_LAYOUT_WITH_ONEBYTE(Class);
11831193
DEFAULT_LAYOUT_WITH_ONEBYTE(ElementU);
11841194
DEFAULT_LAYOUT_WITH_ONEBYTE(ElementRootU);
1195+
DEFAULT_LAYOUT_WITH_ONEBYTE(ElementScopedC);
1196+
DEFAULT_LAYOUT_WITH_ONEBYTE(ElementScopedC2);
11851197
DEFAULT_LAYOUT(BrProperty);
11861198
DEFAULT_LAYOUT(BrEnvProperty);
11871199
DEFAULT_LAYOUT(BrLocalProperty);

‎test/Array/rlexe.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<compile-flags>-Serialized</compile-flags>
1919
<files>array_init2.js</files>
2020
<baseline>array_init2.baseline</baseline>
21+
<tags>exclude_forceserialized</tags>
2122
</default>
2223
</test>
2324
<test>
@@ -616,7 +617,7 @@
616617
<test>
617618
<default>
618619
<files>CopyOnAccessArray_cache_index_overflow.js</files>
619-
<tags>BugFix,require_backend</tags>
620+
<tags>BugFix,require_backend,exclude_forceserialized</tags>
620621
<compile-flags>-force:copyonaccessarray -testtrace:CopyOnAccessArray</compile-flags>
621622
<baseline>CopyOnAccessArray_cache_index_overflow.baseline</baseline>
622623
</default>

‎test/Closures/rlexe.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
<compile-flags>-Serialized</compile-flags>
108108
<files>invalcachedscope.js</files>
109109
<baseline>invalcachedscope.baseline</baseline>
110+
<tags>exclude_forceserialized</tags>
110111
</default>
111112
</test>
112113
<test>

‎test/Function/rlexe.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
<default>
382382
<files>StackArgsWithFormals.js</files>
383383
<compile-flags>-mic:1 -off:simpleJit -trace:stackargformalsopt</compile-flags>
384-
<tags>exclude_dynapogo,exclude_ship,exclude_fre,exclude_nonative,require_backend</tags>
384+
<tags>exclude_dynapogo,exclude_ship,exclude_fre,exclude_nonative,require_backend,exclude_forceserialized</tags>
385385
<baseline>StackArgsWithFormals.baseline</baseline>
386386
</default>
387387
</test>

‎test/Optimizer/rlexe.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@
10081008
<baseline>test143.baseline</baseline>
10091009
<compile-flags>-bgJit- -off:simpleJit -loopInterpretCount:1 -testTrace:arrayCheckHoist</compile-flags>
10101010
<!-- ch.exe doesn't output entire baseline before exiting; -testTrace flush issue? -->
1011-
<tags>exclude_dynapogo,exclude_ship</tags>
1011+
<tags>exclude_dynapogo,exclude_ship,exclude_forceserialized</tags>
10121012
</default>
10131013
</test>
10141014
<test>

‎test/UnifiedRegex/rlexe.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
<compile-flags>-Serialized</compile-flags>
144144
<files>propertyString.js</files>
145145
<baseline>propertyString.baseline</baseline>
146+
<tags>exclude_forceserialized</tags>
146147
</default>
147148
</test>
148149
<test>

‎test/es5/rlexe.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
<compile-flags>-Serialized</compile-flags>
160160
<files>defineProperty.js</files>
161161
<baseline>defineProperty.baseline</baseline>
162+
<tags>exclude_forceserialized</tags>
162163
</default>
163164
</test>
164165
<test>
@@ -172,6 +173,7 @@
172173
<compile-flags>-Serialized</compile-flags>
173174
<files>defineIndexProperty.js</files>
174175
<baseline>defineIndexProperty.baseline</baseline>
176+
<tags>exclude_forceserialized</tags>
175177
</default>
176178
</test>
177179
<test>

‎test/es6/rlexe.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@
821821
<default>
822822
<files>generators-deferred.js</files>
823823
<compile-flags>-ES6Generators -JitES6Generators -ES6Classes -serialized</compile-flags>
824-
<tags>exclude_arm</tags>
824+
<tags>exclude_arm,exclude_forceserialized</tags>
825825
</default>
826826
</test>
827827
<test>

‎test/fieldopts/rlexe.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
<files>fieldhoist_negzero.js</files>
204204
<compile-flags>-force:fieldhoist -Serialized</compile-flags>
205205
<baseline>fieldhoist_negzero.baseline</baseline>
206-
<tags>exclude_ship</tags>
206+
<tags>exclude_ship,exclude_forceserialized</tags>
207207
</default>
208208
</test>
209209
<test>

‎test/runtests.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,17 +431,17 @@ goto :main
431431
)
432432
if "%_TESTCONFIG%"=="forceserialized" (
433433
set EXTRA_CC_FLAGS=%EXTRA_CC_FLAGS% -forceserialized
434-
set EXTRA_RL_FLAGS=
434+
set EXTRA_RL_FLAGS=-nottags:exclude_forceserialized
435435
set _exclude_serialized=-nottags:exclude_serialized
436436
)
437437
if "%_TESTCONFIG%"=="mediumlayout" (
438438
set EXTRA_CC_FLAGS=%EXTRA_CC_FLAGS% -MediumByteCodeLayout -forceserialized
439-
set EXTRA_RL_FLAGS=-nottags:exclude_bytecodelayout
439+
set EXTRA_RL_FLAGS=-nottags:exclude_bytecodelayout -nottags:exclude_forceserialized
440440
set _exclude_serialized=-nottags:exclude_serialized
441441
)
442442
if "%_TESTCONFIG%"=="largelayout" (
443443
set EXTRA_CC_FLAGS=%EXTRA_CC_FLAGS% -LargeByteCodeLayout -forceserialized
444-
set EXTRA_RL_FLAGS=-nottags:exclude_bytecodelayout
444+
set EXTRA_RL_FLAGS=-nottags:exclude_bytecodelayout -nottags:exclude_forceserialized
445445
set _exclude_serialized=-nottags:exclude_serialized
446446
)
447447

0 commit comments

Comments
 (0)