Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
2e7213e5
D
dragonwell8_nashorn
项目概览
openanolis
/
dragonwell8_nashorn
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_nashorn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2e7213e5
编写于
12月 11, 2013
作者:
L
lagergren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8029780: "ant externals" broke our test harness with the latest version of the octane benchmarks
Reviewed-by: attila, sundar
上级
0052ef97
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
129 addition
and
68 deletion
+129
-68
make/build-benchmark.xml
make/build-benchmark.xml
+43
-4
test/script/basic/compile-octane-splitter.js.EXPECTED
test/script/basic/compile-octane-splitter.js.EXPECTED
+14
-13
test/script/basic/compile-octane.js.EXPECTED
test/script/basic/compile-octane.js.EXPECTED
+14
-13
test/script/basic/run-octane.js
test/script/basic/run-octane.js
+58
-38
未找到文件。
make/build-benchmark.xml
浏览文件 @
2e7213e5
...
...
@@ -239,7 +239,7 @@
</antcall>
</target>
<target
name=
"octane-regexp-
octane-
v8"
depends=
"jar"
>
<target
name=
"octane-regexp-v8"
depends=
"jar"
>
<antcall
target=
"run-octane-v8"
>
<param
name=
"octane-tests"
value=
"regexp"
/>
</antcall>
...
...
@@ -291,17 +291,56 @@
</antcall>
</target>
<!-- splay -->
<target
name=
"octane-typescript"
depends=
"jar"
>
<antcall
target=
"run-octane"
>
<param
name=
"octane-tests"
value=
"typescript"
/>
</antcall>
</target>
<target
name=
"octane-typescript-v8"
depends=
"jar"
>
<antcall
target=
"run-octane-v8"
>
<param
name=
"octane-typescript"
value=
"typescript"
/>
</antcall>
</target>
<target
name=
"octane-typescript-rhino"
depends=
"jar"
>
<antcall
target=
"run-octane-rhino"
>
<param
name=
"octane-tests"
value=
"typescript"
/>
</antcall>
</target>
<!-- zlib -->
<target
name=
"octane-zlib"
depends=
"jar"
>
<antcall
target=
"run-octane"
>
<param
name=
"octane-tests"
value=
"zlib"
/>
</antcall>
</target>
<target
name=
"octane-zlib-v8"
depends=
"jar"
>
<antcall
target=
"run-octane-v8"
>
<param
name=
"octane-typescript"
value=
"zlib"
/>
</antcall>
</target>
<target
name=
"octane-zlib-rhino"
depends=
"jar"
>
<antcall
target=
"run-octane-rhino"
>
<param
name=
"octane-tests"
value=
"zlib"
/>
</antcall>
</target>
<!-- run octane benchmarks in a single process -->
<target
name=
"octane-single-process"
depends=
"octane-init"
>
<antcall
target=
"run-octane"
/>
</target>
<!--
mandreel excluded due to OOM
-->
<!--
zlib excluded due to missing implementation of 'read'
-->
<target
name=
"octane-separate-process"
depends=
"octane-box2d, octane-code-load, octane-crypto,
octane-deltablue, octane-earley-boyer, octane-gbemu,
octane-navier-stokes, octane-pdfjs, octane-raytrace,
octane-regexp, octane-richards, octane-splay"
/>
octane-mandreel, octane-navier-stokes, octane-pdfjs,
octane-raytrace, octane-regexp, octane-richards,
octane-splay, octane-typescript"
/>
<target
name=
"--single-process"
unless=
"${octane-test-sys-prop.separate.process}"
>
<antcall
target=
"octane-single-process"
/>
...
...
test/script/basic/compile-octane-splitter.js.EXPECTED
浏览文件 @
2e7213e5
Compiled OK: box2d
Compiled OK: code-load
Compiled OK: crypto
Compiled OK: deltablue
Compiled OK: earley-boyer
Compiled OK: gbemu
Compiled OK: mandreel
Compiled OK: navier-stokes
Compiled OK: pdfjs
Compiled OK: raytrace
Compiled OK: regexp
Compiled OK: richards
Compiled OK: splay
[box2d] Compiled OK
[code-load] Compiled OK
[crypto] Compiled OK
[deltablue] Compiled OK
[earley-boyer] Compiled OK
[gbemu] Compiled OK
[mandreel] Compiled OK
[navier-stokes] Compiled OK
[pdfjs] Compiled OK
[raytrace] Compiled OK
[regexp] Compiled OK
[richards] Compiled OK
[splay] Compiled OK
[typescript] Compiled OK
test/script/basic/compile-octane.js.EXPECTED
浏览文件 @
2e7213e5
Compiled OK: box2d
Compiled OK: code-load
Compiled OK: crypto
Compiled OK: deltablue
Compiled OK: earley-boyer
Compiled OK: gbemu
Compiled OK: mandreel
Compiled OK: navier-stokes
Compiled OK: pdfjs
Compiled OK: raytrace
Compiled OK: regexp
Compiled OK: richards
Compiled OK: splay
[box2d] Compiled OK
[code-load] Compiled OK
[crypto] Compiled OK
[deltablue] Compiled OK
[earley-boyer] Compiled OK
[gbemu] Compiled OK
[mandreel] Compiled OK
[navier-stokes] Compiled OK
[pdfjs] Compiled OK
[raytrace] Compiled OK
[regexp] Compiled OK
[richards] Compiled OK
[splay] Compiled OK
[typescript] Compiled OK
test/script/basic/run-octane.js
浏览文件 @
2e7213e5
...
...
@@ -26,19 +26,22 @@
*/
var
tests
=
[
{
file
:
"
box2d
"
,
suite
:
"
Box2DBenchmark
"
},
{
file
:
"
code-load
"
,
suite
:
"
CodeLoad
"
},
{
file
:
"
crypto
"
,
suite
:
"
Crypto
"
},
{
file
:
"
deltablue
"
,
suite
:
"
DeltaBlue
"
},
{
file
:
"
earley-boyer
"
,
suite
:
"
EarleyBoyer
"
},
{
file
:
"
gbemu
"
,
suite
:
"
GameboyBenchmark
"
},
{
file
:
"
mandreel
"
,
suite
:
"
MandreelBenchmark
"
},
{
file
:
"
navier-stokes
"
,
suite
:
"
NavierStokes
"
},
{
file
:
"
pdfjs
"
,
suite
:
"
PdfJS
"
},
{
file
:
"
raytrace
"
,
suite
:
"
RayTrace
"
},
{
file
:
"
regexp
"
,
suite
:
"
RegExpSuite
"
},
{
file
:
"
richards
"
,
suite
:
"
Richards
"
},
{
file
:
"
splay
"
,
suite
:
"
Splay
"
}
{
name
:
"
box2d
"
,
files
:[
"
box2d.js
"
],
suite
:
"
Box2DBenchmark
"
},
{
name
:
"
code-load
"
,
files
:[
"
code-load.js
"
],
suite
:
"
CodeLoad
"
},
{
name
:
"
crypto
"
,
files
:[
"
crypto.js
"
],
suite
:
"
Crypto
"
},
{
name
:
"
deltablue
"
,
files
:[
"
deltablue.js
"
],
suite
:
"
DeltaBlue
"
},
{
name
:
"
earley-boyer
"
,
files
:[
"
earley-boyer.js
"
],
suite
:
"
EarleyBoyer
"
},
{
name
:
"
gbemu
"
,
files
:[
"
gbemu-part1.js
"
,
"
gbemu-part2.js
"
],
suite
:
"
GameboyBenchmark
"
},
{
name
:
"
mandreel
"
,
files
:[
"
mandreel.js
"
],
suite
:
"
MandreelBenchmark
"
},
{
name
:
"
navier-stokes
"
,
files
:[
"
navier-stokes.js
"
],
suite
:
"
NavierStokes
"
},
{
name
:
"
pdfjs
"
,
files
:[
"
pdfjs.js
"
],
suite
:
"
PdfJS
"
},
{
name
:
"
raytrace
"
,
files
:[
"
raytrace.js
"
],
suite
:
"
RayTrace
"
},
{
name
:
"
regexp
"
,
files
:[
"
regexp.js
"
],
suite
:
"
RegExpSuite
"
},
{
name
:
"
richards
"
,
files
:[
"
richards.js
"
],
suite
:
"
Richards
"
},
{
name
:
"
splay
"
,
files
:[
"
splay.js
"
],
suite
:
"
Splay
"
},
{
name
:
"
typescript
"
,
files
:[
"
typescript.js
"
,
"
typescript-input.js
"
,
"
typescript-compiler.js
"
],
suite
:
"
typescript
"
}
//zlib currently disabled - requires read
// {name:"zlib", files:["zlib.js", "zlib-data.js"], suite:"zlib"},
];
var
dir
=
(
typeof
(
__DIR__
)
==
'
undefined
'
)
?
"
test/script/basic/
"
:
__DIR__
;
...
...
@@ -58,26 +61,36 @@ function should_compile_only(name) {
return
(
typeof
compile_only
!==
'
undefined
'
)
}
function
run_one_benchmark
(
arg
,
iters
)
{
var
file_name
;
var
file
=
(
arg
.
file
+
"
.js
"
).
split
(
'
/
'
);
file_name
=
path
+
file
[
file
.
length
-
1
];
function
load_bench
(
arg
)
{
for
(
var
idx
=
0
;
idx
<
arg
.
files
.
length
;
idx
++
)
{
var
f
=
arg
.
files
[
idx
];
var
file
=
f
.
split
(
'
/
'
);
var
file_name
=
path
+
file
[
file
.
length
-
1
];
var
compile_and_return
=
should_compile_only
(
file_name
);
if
(
compile_and_return
)
{
if
(
typeof
compile_only
===
'
undefined
'
)
{
//for a run, skip compile onlies, don't even compile them
return
;
var
compile_and_return
=
should_compile_only
(
file_name
);
if
(
compile_and_return
)
{
if
(
typeof
compile_only
===
'
undefined
'
)
{
//for a run, skip compile onlies, don't even compile them
return
true
;
}
}
print_verbose
(
arg
,
"
loading '
"
+
arg
.
name
+
"
' [
"
+
f
+
"
]...
"
);
load
(
file_name
);
}
print_verbose
(
"
Loading...
"
+
file_name
);
load
(
file_name
);
if
(
compile_and_return
)
{
print_always
(
"
Compiled OK:
"
+
arg
.
file
);
return
;
print_always
(
arg
,
"
Compiled OK
"
);
}
return
!
compile_and_return
;
}
function
run_one_benchmark
(
arg
,
iters
)
{
if
(
!
load_bench
(
arg
))
{
return
;
}
var
success
=
true
;
var
current_name
;
...
...
@@ -95,9 +108,13 @@ function run_one_benchmark(arg, iters) {
try
{
for
(
var
x
=
0
;
x
<
benchmarks
.
length
;
x
++
)
{
//do warmup run
//reset random number generator needed as of octane 9 before each run
BenchmarkSuite
.
ResetRNG
();
benchmarks
[
x
].
Setup
();
}
print_verbose
(
"
Running '
"
+
arg
.
file
+
"
' for
"
+
iters
+
"
iterations of no less than
"
+
min_time
+
"
seconds (
"
+
runtime
+
"
)
"
);
BenchmarkSuite
.
ResetRNG
();
print_verbose
(
arg
,
"
running '
"
+
arg
.
name
+
"
' for
"
+
iters
+
"
iterations of no less than
"
+
min_time
+
"
seconds (
"
+
runtime
+
"
)
"
);
var
scores
=
[];
...
...
@@ -112,6 +129,9 @@ function run_one_benchmark(arg, iters) {
do
{
for
(
var
i
=
0
;
i
<
len
;
i
++
)
{
benchmarks
[
i
].
run
();
//important - no timing here like elapsed = new Date() - start, as in the
//original harness. This will make timing very non-deterministic.
//NOTHING else must live in this loop
}
ops
+=
len
;
elapsed
=
new
Date
-
start
;
...
...
@@ -120,7 +140,7 @@ function run_one_benchmark(arg, iters) {
var
score
=
ops
/
elapsed
*
1000
*
60
;
scores
.
push
(
score
);
var
name
=
it
==
0
?
"
warmup
"
:
"
iteration
"
+
it
;
print_verbose
(
"
[
"
+
arg
.
file
+
"
]
"
+
name
+
"
finished
"
+
score
.
toFixed
(
0
)
+
"
ops/minute
"
);
print_verbose
(
arg
,
name
+
"
finished
"
+
score
.
toFixed
(
0
)
+
"
ops/minute
"
);
}
for
(
var
x
=
0
;
x
<
benchmarks
.
length
;
x
++
)
{
...
...
@@ -140,20 +160,20 @@ function run_one_benchmark(arg, iters) {
scores
=
[
0
];
}
var
res
=
"
[
"
+
arg
.
file
+
"
]
"
+
mean_score
.
toFixed
(
0
);
var
res
=
mean_score
.
toFixed
(
0
);
if
(
verbose
)
{
res
+=
"
ops/minute (
"
+
min_score
.
toFixed
(
0
)
+
"
-
"
+
max_score
.
toFixed
(
0
)
+
"
), warmup=
"
+
scores
[
0
].
toFixed
(
0
);
}
print_always
(
res
);
print_always
(
arg
,
res
);
}
function
print_always
(
x
)
{
print
(
x
);
function
print_always
(
arg
,
x
)
{
print
(
"
[
"
+
arg
.
name
+
"
]
"
+
x
);
}
function
print_verbose
(
x
)
{
function
print_verbose
(
arg
,
x
)
{
if
(
verbose
)
{
print
(
x
);
print
_always
(
arg
,
x
)
}
}
...
...
@@ -209,7 +229,7 @@ for (var i = 0; i < args.length; i++) {
}
else
{
var
found
=
false
;
for
(
j
in
tests
)
{
if
(
tests
[
j
].
fil
e
===
arg
)
{
if
(
tests
[
j
].
nam
e
===
arg
)
{
tests_found
.
push
(
tests
[
j
]);
found
=
true
;
break
;
...
...
@@ -221,7 +241,7 @@ for (var i = 0; i < args.length; i++) {
if
(
j
!=
0
)
{
str
+=
"
,
"
;
}
str
+=
"
'
"
+
tests
[
j
].
fil
e
+
"
'
"
;
str
+=
"
'
"
+
tests
[
j
].
nam
e
+
"
'
"
;
}
throw
str
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录