Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 673ca8e

Browse files
rhuanjlrhuanjl
committedMay 2, 2024·
Update Tests cases for Generator Jit
1 parent 7cfa52a commit 673ca8e

15 files changed

+465
-45
lines changed
 

‎test/es6/rlexe.xml

-43
Original file line numberDiff line numberDiff line change
@@ -132,48 +132,6 @@
132132
<tags>exclude_dynapogo</tags>
133133
</default>
134134
</test>
135-
<test>
136-
<default>
137-
<files>generator-jit-bugs.js</files>
138-
<compile-flags>-JitES6Generators -args summary -endargs</compile-flags>
139-
<tags>exclude_nonative</tags>
140-
</default>
141-
</test>
142-
<test>
143-
<default>
144-
<files>generator-jit-bugs.js</files>
145-
<compile-flags>-JitES6Generators -off:simplejit -args summary -endargs</compile-flags>
146-
<tags>exclude_nonative</tags>
147-
</default>
148-
</test>
149-
<test>
150-
<default>
151-
<files>generator-jit-bugs.js</files>
152-
<compile-flags>-JitES6Generators -off:fulljit -args summary -endargs</compile-flags>
153-
<tags>exclude_nonative, exclude_dynapogo</tags>
154-
</default>
155-
</test>
156-
<test>
157-
<default>
158-
<files>async-jit-bugs.js</files>
159-
<compile-flags>-JitES6Generators -args summary -endargs</compile-flags>
160-
<tags>exclude_nonative</tags>
161-
</default>
162-
</test>
163-
<test>
164-
<default>
165-
<files>async-jit-bugs.js</files>
166-
<compile-flags>-JitES6Generators -off:simplejit -args summary -endargs</compile-flags>
167-
<tags>exclude_nonative</tags>
168-
</default>
169-
</test>
170-
<test>
171-
<default>
172-
<files>async-jit-bugs.js</files>
173-
<compile-flags>-JitES6Generators -off:fulljit -args summary -endargs</compile-flags>
174-
<tags>exclude_nonative, exclude_dynapogo</tags>
175-
</default>
176-
</test>
177135
<test>
178136
<default>
179137
<files>proto_basic.js</files>
@@ -913,7 +871,6 @@
913871
<test>
914872
<default>
915873
<files>generators-functionality.js</files>
916-
<!-- <compile-flags>-ES6Generators -JitES6Generators -args summary -endargs</compile-flags> -->
917874
<compile-flags>-ES6Generators -args summary -endargs</compile-flags>
918875
<tags>exclude_arm</tags>
919876
</default>

‎test/es6/async-jit-bugs.js ‎test/es6GeneratorJit/async-jit-bugs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//-------------------------------------------------------------------------------------------------------
22
// Copyright (C) Microsoft. All rights reserved.
3-
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
44
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
55
//-------------------------------------------------------------------------------------------------------
66

‎test/es6/generator-jit-bugs.js ‎test/es6GeneratorJit/generator-jit-bugs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//-------------------------------------------------------------------------------------------------------
22
// Copyright (C) Microsoft. All rights reserved.
3-
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
44
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
55
//-------------------------------------------------------------------------------------------------------
66

‎test/es6GeneratorJit/jit-async-loop-body-2.baseline

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Beginning basicAsync
2+
basicAsync Loop 0 a = 80
3+
basicAsync Loop 0 arguments[0] = 80
4+
basicAsync Loop 0 a = 160
5+
basicAsync Loop 0 arguments[0] = 160
6+
Loop 3 completed
7+
Loop 4 k = 160
8+
Loop 4 k = 80
9+
Loop 4 k = 0
10+
Loop 4 completed
11+
Beginning basicAsync
12+
basicAsync Loop 0 a = 80
13+
basicAsync Loop 0 arguments[0] = 80
14+
basicAsync Loop 0 a = 160
15+
basicAsync Loop 0 arguments[0] = 160
16+
Loop 3 completed
17+
Loop 4 k = 160
18+
Loop 4 k = 80
19+
Loop 4 k = 0
20+
Loop 4 completed

‎test/es6GeneratorJit/jit-async-loop-body.baseline

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
Beginning basicAsync
2+
---BeginBackEnd: function: printif---
3+
---EndBackEnd---
4+
---BeginBackEnd: function: printif---
5+
---EndBackEnd---
6+
---BeginBackEnd: function: basicAsync, loop:1---
7+
---EndBackEnd---
8+
basicAsync Loop 0 a = 80
9+
basicAsync Loop 0 arguments[0] = 80
10+
---BeginBackEnd: function: basicAsync, loop:0---
11+
---EndBackEnd---
12+
basicAsync Loop 0 a = 160
13+
basicAsync Loop 0 arguments[0] = 160
14+
Loop 3 completed
15+
---BeginBackEnd: function: value---
16+
---EndBackEnd---
17+
---BeginBackEnd: function: value---
18+
---EndBackEnd---
19+
---BeginBackEnd: function: value---
20+
---EndBackEnd---
21+
Loop 4 k = 160
22+
---BeginBackEnd: function: basicAsync, loop:4---
23+
---EndBackEnd---
24+
Loop 4 k = 80
25+
Loop 4 k = 0
26+
Loop 4 completed
27+
Beginning basicAsync
28+
basicAsync Loop 0 a = 80
29+
basicAsync Loop 0 arguments[0] = 80
30+
basicAsync Loop 0 a = 160
31+
basicAsync Loop 0 arguments[0] = 160
32+
Loop 3 completed
33+
---BeginBackEnd: function: Array.prototype.values---
34+
---EndBackEnd---
35+
---BeginBackEnd: function: Anonymous function---
36+
---EndBackEnd---
37+
---BeginBackEnd: function: Anonymous function---
38+
---EndBackEnd---
39+
Loop 4 k = 160
40+
Loop 4 k = 80
41+
Loop 4 k = 0
42+
Loop 4 completed

‎test/es6GeneratorJit/jit-async-loop-body.js

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//-------------------------------------------------------------------------------------------------------
2+
// Copyright (C) Microsoft. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
4+
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
5+
//-------------------------------------------------------------------------------------------------------
6+
7+
let bar = [];
8+
let j = 0;
9+
10+
function printif (text, x, mod) {
11+
if (x % mod == 0) {
12+
print (text + x);
13+
}
14+
}
15+
16+
async function basicAsync(a, b) {
17+
print("Beginning basicAsync")
18+
await b;
19+
var foo = [0.1, 0.2, 0.3, 0.4, 0];
20+
while (a < 200) { // Loop 0 - should be jitted
21+
foo[a] = Math.random();
22+
printif(arguments.callee.name + " Loop 0 a = ", a, 80);
23+
printif(arguments.callee.name + " Loop 0 arguments[0] = ", arguments[0], 80);
24+
for (let k in foo) { bar[k] = a - k;} // Loop 1 - shuld be jitted
25+
++a;
26+
}
27+
while (true){ // Loop 2 - should not be jitted
28+
for (j = 0; j < 100; ++j) { // Loop 3 - should not be jitted
29+
await j;
30+
foo[j] = j;
31+
}
32+
print("Loop 3 completed");
33+
for (let k of bar) { // Loop 4 - should be jitted
34+
printif("Loop 4 k = ", k, 80);
35+
foo[0] = foo[1] + 1;
36+
}
37+
print("Loop 4 completed");
38+
return j;
39+
}
40+
}
41+
42+
basicAsync(4, 3).then(x => basicAsync(3, 2));

‎test/es6GeneratorJit/jit-gen-loop-body-2.baseline

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Beginning test of basicGenerator
2+
basicGenerator Loop 0 a = 40
3+
basicGenerator Loop 0 arguments[0] = 40
4+
basicGenerator Loop 0 a = 80
5+
basicGenerator Loop 0 arguments[0] = 80
6+
Loop 3 completed
7+
Loop 4 k = 80
8+
Loop 4 k = 40
9+
Loop 4 k = 0
10+
Loop 4 completed
11+
yielded value = 80
12+
yielded value = 40
13+
yielded value = 0

‎test/es6GeneratorJit/jit-gen-loop-body.baseline

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
Beginning test of basicGenerator
2+
---BeginBackEnd: function: printif---
3+
---EndBackEnd---
4+
---BeginBackEnd: function: printif---
5+
---EndBackEnd---
6+
---BeginBackEnd: function: basicGenerator, loop:1---
7+
---EndBackEnd---
8+
basicGenerator Loop 0 a = 40
9+
basicGenerator Loop 0 arguments[0] = 40
10+
---BeginBackEnd: function: basicGenerator, loop:0---
11+
---EndBackEnd---
12+
basicGenerator Loop 0 a = 80
13+
basicGenerator Loop 0 arguments[0] = 80
14+
Loop 3 completed
15+
---BeginBackEnd: function: value---
16+
---EndBackEnd---
17+
---BeginBackEnd: function: value---
18+
---EndBackEnd---
19+
---BeginBackEnd: function: value---
20+
---EndBackEnd---
21+
Loop 4 k = 80
22+
---BeginBackEnd: function: basicGenerator, loop:4---
23+
---EndBackEnd---
24+
Loop 4 k = 40
25+
Loop 4 k = 0
26+
Loop 4 completed
27+
---BeginBackEnd: function: Array.prototype.values---
28+
---EndBackEnd---
29+
---BeginBackEnd: function: Anonymous function---
30+
---EndBackEnd---
31+
---BeginBackEnd: function: Anonymous function---
32+
---EndBackEnd---
33+
yielded value = 80
34+
yielded value = 40
35+
yielded value = 0

‎test/es6GeneratorJit/jit-gen-loop-body.js

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
//-------------------------------------------------------------------------------------------------------
2+
// Copyright (C) Microsoft. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
4+
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
5+
//-------------------------------------------------------------------------------------------------------
6+
7+
let bar = [];
8+
let j = 0;
9+
10+
function printif (text, x, mod) {
11+
if (x % mod == 0) {
12+
print (text + x);
13+
}
14+
}
15+
16+
function* basicGenerator(a, b) {
17+
print("Beginning test of " + arguments.callee.name);
18+
yield "yield 2nd param b =" + b;
19+
var foo = [0.1, 0.2, 0.3, 0.4, 0];
20+
while (a < 100) { // Loop 0 - should be jitted
21+
foo[a] = Math.random();
22+
printif(arguments.callee.name + " Loop 0 a = ", a, 40);
23+
printif(arguments.callee.name + " Loop 0 arguments[0] = ", arguments[0], 40);
24+
for (let k in foo) { bar[k] = a - k;} // Loop 1 - shuld be jitted
25+
++a;
26+
}
27+
while (true){ // Loop 2 - should not be jitted
28+
for (j = 0; j < 100; ++j) { // Loop 3 - should not be jitted
29+
if (j % 40 == 1)
30+
yield j;
31+
32+
foo[j] = j;
33+
}
34+
print("Loop 3 completed");
35+
for (let k of bar) { // Loop 4 - should be jitted
36+
printif("Loop 4 k = ", k, 40);
37+
foo[0] = foo[1] + 1;
38+
}
39+
print("Loop 4 completed");
40+
yield* bar; // Loop 5 - should not be jitted
41+
return j;
42+
}
43+
}
44+
45+
const gen = basicGenerator(5, 1);
46+
for (let x = gen.next(); !x.done; x = gen.next() ) {
47+
printif("yielded value = ", x.value, 40);
48+
}

‎test/es6GeneratorJit/jit-module-loop-body-2.baseline

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Loop 0 a = 40
2+
Loop 0 a = 80
3+
Loop 0 a = 120
4+
Loop 0 a = 160
5+
Loop 3 completed
6+
Loop 4 k = 160
7+
Loop 4 k = 120
8+
Loop 4 k = 80
9+
Loop 4 k = 40
10+
Loop 4 k = 0
11+
Loop 4 completed

‎test/es6GeneratorJit/jit-module-loop-body.baseline

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---BeginBackEnd: function: printif---
2+
---EndBackEnd---
3+
---BeginBackEnd: function: printif---
4+
---EndBackEnd---
5+
---BeginBackEnd: function: Module code, loop:1---
6+
---EndBackEnd---
7+
Loop 0 a = 40
8+
Loop 0 a = 80
9+
Loop 0 a = 120
10+
---BeginBackEnd: function: Module code, loop:0---
11+
---EndBackEnd---
12+
Loop 0 a = 160
13+
Loop 3 completed
14+
---BeginBackEnd: function: value---
15+
---EndBackEnd---
16+
---BeginBackEnd: function: value---
17+
---EndBackEnd---
18+
---BeginBackEnd: function: value---
19+
---EndBackEnd---
20+
Loop 4 k = 160
21+
---BeginBackEnd: function: Module code, loop:4---
22+
---EndBackEnd---
23+
Loop 4 k = 120
24+
Loop 4 k = 80
25+
Loop 4 k = 40
26+
Loop 4 k = 0
27+
Loop 4 completed

‎test/es6GeneratorJit/jit-module-loop-body.js

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
//-------------------------------------------------------------------------------------------------------
2+
// Copyright (C) Microsoft. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
4+
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
5+
//-------------------------------------------------------------------------------------------------------
6+
7+
let bar = [];
8+
let j = 0, a = 3, b = 2;
9+
10+
function printif (text, x, mod) {
11+
if (x % mod == 0) {
12+
print (text + x);
13+
}
14+
}
15+
16+
17+
await b;
18+
var foo = [0.1, 0.2, 0.3, 0.4, 0];
19+
while (a < 200) { // Loop 0 - should be jitted
20+
foo[a] = Math.random();
21+
printif("Loop 0 a = ", a, 40);
22+
for (let k in foo) { bar[k] = a - k;} // Loop 1 - shuld be jitted
23+
++a;
24+
}
25+
while (true){ // Loop 2 - should not be jitted
26+
for (j = 0; j < 100; ++j) { // Loop 3 - should not be jitted
27+
await j;
28+
29+
foo[j] = j;
30+
}
31+
print("Loop 3 completed");
32+
for (let k of bar) { // Loop 4 - should be jitted
33+
printif("Loop 4 k = ", k, 40);
34+
foo[0] = foo[1] + 1;
35+
}
36+
print("Loop 4 completed");
37+
await j;
38+
break;
39+
}
40+
41+

‎test/es6GeneratorJit/newtest.js

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
//-------------------------------------------------------------------------------------------------------
2+
// Copyright (C) Microsoft. All rights reserved.
3+
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
4+
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
5+
//-------------------------------------------------------------------------------------------------------
6+
7+
// Simpler mini-test harness to avoid any complicating factors when testing these jit bugs
8+
var results = 0;
9+
var test = 0;
10+
const verbose = WScript.Arguments[0] != "summary";
11+
12+
function check(actual, expected) {
13+
if (actual != expected)
14+
throw new Error("Generator produced " + actual + " instead of " + expected);
15+
if (verbose)
16+
print('Result ' + ++results + ' Generator correctly produced ' + actual);
17+
}
18+
19+
function title (name) {
20+
if (verbose) {
21+
print("Beginning Test " + ++test + ": " + name);
22+
results = 0;
23+
}
24+
}
25+
26+
27+
// Test 1 - Construction after self-reference in loop control
28+
title("Construction after self-reference in loop control");
29+
30+
function testOne()
31+
{
32+
function* foo(a1,a2) {
33+
34+
for (let i = a1; i < foo; i = i + a2)
35+
{
36+
yield 0;
37+
}
38+
39+
function bar() {}
40+
var b = new bar();
41+
}
42+
43+
foo().next()
44+
return true;
45+
}
46+
47+
48+
for (var i = 0; i < 30 ;++i){
49+
testOne();
50+
}
51+
52+
print('pass')

‎test/es6GeneratorJit/rlexe.xml

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<regress-exe>
3+
<test>
4+
<default>
5+
<files>generator-jit-bugs.js</files>
6+
<compile-flags>-JitES6Generators -args summary -endargs</compile-flags>
7+
<tags>exclude_nonative</tags>
8+
</default>
9+
</test>
10+
<test>
11+
<default>
12+
<files>generator-jit-bugs.js</files>
13+
<compile-flags>-JitES6Generators -off:simplejit -args summary -endargs</compile-flags>
14+
<tags>exclude_nonative</tags>
15+
</default>
16+
</test>
17+
<test>
18+
<default>
19+
<files>generator-jit-bugs.js</files>
20+
<compile-flags>-JitES6Generators -off:fulljit -args summary -endargs</compile-flags>
21+
<tags>exclude_nonative, exclude_dynapogo</tags>
22+
</default>
23+
</test>
24+
<test>
25+
<default>
26+
<files>async-jit-bugs.js</files>
27+
<compile-flags>-JitES6Generators -args summary -endargs</compile-flags>
28+
<tags>exclude_nonative</tags>
29+
</default>
30+
</test>
31+
<test>
32+
<default>
33+
<files>async-jit-bugs.js</files>
34+
<compile-flags>-JitES6Generators -off:simplejit -args summary -endargs</compile-flags>
35+
<tags>exclude_nonative</tags>
36+
</default>
37+
</test>
38+
<test>
39+
<default>
40+
<files>async-jit-bugs.js</files>
41+
<compile-flags>-JitES6Generators -off:fulljit -args summary -endargs</compile-flags>
42+
<tags>exclude_nonative, exclude_dynapogo</tags>
43+
</default>
44+
</test>
45+
<test>
46+
<default>
47+
<files>async-jit-bugs.js</files>
48+
<compile-flags>-off:fulljit -args summary -endargs</compile-flags>
49+
<tags>exclude_nonative, exclude_dynapogo</tags>
50+
</default>
51+
</test>
52+
<test>
53+
<default>
54+
<files>newTest.js</files>
55+
<compile-flags>-args summary -endargs</compile-flags>
56+
<tags>exclude_nonative</tags>
57+
</default>
58+
</test>
59+
<test>
60+
<default>
61+
<files>newTest.js</files>
62+
<compile-flags>-off:simplejit -args summary -endargs</compile-flags>
63+
<tags>exclude_nonative</tags>
64+
</default>
65+
</test>
66+
<test>
67+
<default>
68+
<files>newTest.js</files>
69+
<compile-flags>-off:fulljit -args summary -endargs</compile-flags>
70+
<tags>exclude_nonative, exclude_dynapogo</tags>
71+
</default>
72+
</test>
73+
<test>
74+
<default>
75+
<files>newTest.js</files>
76+
<compile-flags>-off:fulljit -args summary -endargs</compile-flags>
77+
<tags>exclude_nonative, exclude_dynapogo</tags>
78+
</default>
79+
</test>
80+
<test>
81+
<default>
82+
<files>jit-gen-loop-body.js</files>
83+
<compile-flags>-testtrace:Backend</compile-flags>
84+
<baseline>jit-gen-loop-body.baseline</baseline>
85+
<tags>exclude_nonative, exclude_dynapogo</tags>
86+
</default>
87+
</test>
88+
<test>
89+
<default>
90+
<files>jit-gen-loop-body.js</files>
91+
<baseline>jit-gen-loop-body-2.baseline</baseline>
92+
<tags>exclude_nonative</tags>
93+
</default>
94+
</test>
95+
<test>
96+
<default>
97+
<files>jit-async-loop-body.js</files>
98+
<compile-flags>-testtrace:Backend</compile-flags>
99+
<baseline>jit-async-loop-body.baseline</baseline>
100+
<tags>exclude_nonative, exclude_dynapogo</tags>
101+
</default>
102+
</test>
103+
<test>
104+
<default>
105+
<files>jit-async-loop-body.js</files>
106+
<baseline>jit-async-loop-body-2.baseline</baseline>
107+
<tags>exclude_nonative</tags>
108+
</default>
109+
</test>
110+
<test>
111+
<default>
112+
<files>jit-module-loop-body.js</files>
113+
<compile-flags>-testtrace:Backend -module</compile-flags>
114+
<baseline>jit-module-loop-body.baseline</baseline>
115+
<tags>exclude_nonative, exclude_dynapogo</tags>
116+
</default>
117+
</test>
118+
<test>
119+
<default>
120+
<files>jit-module-loop-body.js</files>
121+
<compile-flags>-module</compile-flags>
122+
<baseline>jit-module-loop-body-2.baseline</baseline>
123+
<tags>exclude_nonative</tags>
124+
</default>
125+
</test>
126+
</regress-exe>

‎test/rlexedirs.xml

+6
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,12 @@
262262
<files>es6</files>
263263
</default>
264264
</dir>
265+
<dir>
266+
<default>
267+
<files>es6GeneratorJit</files>
268+
<tags>require_backend</tags>
269+
</default>
270+
</dir>
265271
<dir>
266272
<default>
267273
<files>es6module</files>

0 commit comments

Comments
 (0)
Please sign in to comment.