--- a/src/benchmarks/Jasper.st Sun Nov 04 19:22:03 2012 +0000
+++ b/src/benchmarks/Jasper.st Sun Nov 04 20:47:51 2012 +0000
@@ -8,7 +8,7 @@
!
-!Saxon methodsFor:'running'!
+!Jasper methodsFor:'running'!
runBenchmarkS:n
^ 'N/A'
@@ -16,8 +16,8 @@
"Created: / 31-10-2012 / 10:21:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-!Saxon class methodsFor:'documentation'!
+!Jasper class methodsFor:'documentation'!
version_SVN
- ^ '$Id:: Saxon.st 2140 2012-10-31 11:16:49Z vranyj1 $'
+ ^ '$Id:: Jasper.st 2140 2012-10-31 11:16:49Z vranyj1 $'
! !
--- a/src/benchmarks/Make.spec Sun Nov 04 19:22:03 2012 +0000
+++ b/src/benchmarks/Make.spec Sun Nov 04 20:47:51 2012 +0000
@@ -60,6 +60,7 @@
OverloadedMethods \
OverloadedMethods2 \
Saxon \
+ Jasper \
Strcat \
Threadring \
stx_libjava_benchmarks \
@@ -82,6 +83,7 @@
$(OUTDIR)OverloadedMethods.$(O) \
$(OUTDIR)OverloadedMethods2.$(O) \
$(OUTDIR)Saxon.$(O) \
+ $(OUTDIR)Jasper.$(O) \
$(OUTDIR)Strcat.$(O) \
$(OUTDIR)Threadring.$(O) \
$(OUTDIR)stx_libjava_benchmarks.$(O) \
--- a/src/benchmarks/Rakefile Sun Nov 04 19:22:03 2012 +0000
+++ b/src/benchmarks/Rakefile Sun Nov 04 20:47:51 2012 +0000
@@ -3,18 +3,19 @@
require 'yaml'
TESTS = [
- [ "Ackerman" , 8 ] ,
- [ "Ary" , 100000 ] ,
- [ "Groovy" , 5 ] ,
- [ "Hash" , 10000 ] ,
- [ "MethodInvocation" , 500000000 ] ,
- [ "ObjectArguments" , 100000000 ] ,
- [ "OverloadedMethods2" , 1000000 ] ,
- [ "OverloadedMethods" , 10000000 ] ,
- [ "PrimitiveArguments" , 100000000 ] ,
- [ "Strcat" , 5000000 ] ,
- [ "WrappedArguments" , 100000 ] ,
- [ "Saxon" , 10 ] ,
+ #[ "Ackerman" , 8 ] ,
+ [ "Jasper" , 1 ] ,
+ #[ "Ary" , 100000 ] ,
+ #[ "Groovy" , 5 ] ,
+ #[ "Hash" , 10000 ] ,
+ #[ "MethodInvocation" , 500000000 ] ,
+ #[ "ObjectArguments" , 100000000 ] ,
+ #[ "OverloadedMethods2" , 1000000 ] ,
+ #[ "OverloadedMethods" , 10000000 ] ,
+ #[ "PrimitiveArguments" , 100000000 ] ,
+ #[ "Strcat" , 5000000 ] ,
+ #[ "WrappedArguments" , 100000 ] ,
+ #[ "Saxon" , 10 ] ,
# Broken
# [ "CrossLanguageInvocation" , 500000000 ] ,
--- a/src/benchmarks/bc.mak Sun Nov 04 19:22:03 2012 +0000
+++ b/src/benchmarks/bc.mak Sun Nov 04 20:47:51 2012 +0000
@@ -88,6 +88,7 @@
$(OUTDIR)OverloadedMethods2.$(O) OverloadedMethods2.$(H): OverloadedMethods2.st $(INCLUDE_TOP)\stx\libjava\benchmarks\JavaBenchmark.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)PrimitiveArguments.$(O) PrimitiveArguments.$(H): PrimitiveArguments.st $(INCLUDE_TOP)\stx\libjava\benchmarks\JavaBenchmark.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Saxon.$(O) Saxon.$(H): Saxon.st $(INCLUDE_TOP)\stx\libjava\benchmarks\JavaBenchmark.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Jasper.$(O) Jasper.$(H): Jasper.st $(INCLUDE_TOP)\stx\libjava\benchmarks\JavaBenchmark.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Strcat.$(O) Strcat.$(H): Strcat.st $(INCLUDE_TOP)\stx\libjava\benchmarks\JavaBenchmark.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Threadring.$(O) Threadring.$(H): Threadring.st $(INCLUDE_TOP)\stx\libjava\benchmarks\JavaBenchmark.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)WrappedArguments.$(O) WrappedArguments.$(H): WrappedArguments.st $(INCLUDE_TOP)\stx\libjava\benchmarks\JavaBenchmark.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/src/benchmarks/java/src/stx/libjava/benchmarks/Jasper.java Sun Nov 04 19:22:03 2012 +0000
+++ b/src/benchmarks/java/src/stx/libjava/benchmarks/Jasper.java Sun Nov 04 20:47:51 2012 +0000
@@ -42,5 +42,5 @@
return time;
}
- private static final String REPORT_PATH = "../postcard.jrxml";
+ private static final String REPORT_PATH = "java/postcard.jrxml";
}
--- a/src/benchmarks/stx_libjava_benchmarks.st Sun Nov 04 19:22:03 2012 +0000
+++ b/src/benchmarks/stx_libjava_benchmarks.st Sun Nov 04 20:47:51 2012 +0000
@@ -52,6 +52,7 @@
OverloadedMethods
OverloadedMethods2
Saxon
+ Jasper
Strcat
Threadring
#'stx_libjava_benchmarks'