diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index fcb6d8c..91f7e2d 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -42,8 +42,8 @@ jobs:
fail-fast: false
max-parallel: 1
matrix:
- luceeVersion: [ 6.2/snapshot/zero, 6.2.0.166/rc/zero, 5.4/snapshot/light ] # 5.4/snapshot/light, 6.0/snapshot/light, 6.1/snapshot/light
- javaVersion: [ 11, 21, 23, 24-ea ]
+ luceeVersion: [ 6.2/snapshot/zero, 6.2.0.166/rc/zero, 6.1/snapshot/zero, 5.4/snapshot/light ] # 6.0/snapshot/light
+ javaVersion: [ 11, 21, 23 ] # 24-ea
exclude:
- luceeVersion: 5.4/snapshot/light
javaVersion: 21
@@ -55,8 +55,12 @@ jobs:
javaVersion: 21
- luceeVersion: 6.0/snapshot/zero
javaVersion: 23
+ - luceeVersion: 6.0/snapshot/zero
+ javaVersion: 24-ea
- luceeVersion: 6.1/snapshot/zero
javaVersion: 23
+ - luceeVersion: 6.1/snapshot/zero
+ javaVersion: 24-ea
- luceeVersion: 6.2.0.166/rc/zero
javaVersion: 11
- luceeVersion: 6.2.0.166/rc/zero
diff --git a/custom/benchmark/report.cfm b/custom/benchmark/report.cfm
index 215a3f8..3b85ed6 100644
--- a/custom/benchmark/report.cfm
+++ b/custom/benchmark/report.cfm
@@ -1,7 +1,7 @@
dir = getDirectoryFromPath( getCurrentTemplatePath() ) & "artifacts";
files = directoryList( dir );
-
+
q = queryNew( "version,java,type,time,runs,inspect,memory,throughput,"
& "_min,_max,_avg,_med,error,raw,_perc,exeLog,totalDuration" );
@@ -53,8 +53,8 @@
exeLog = server.system.environment.EXELOG ?: "";
- javaDistribution = server.system.environment.JAVA_DISTRIBUTION ?: "";
- benchmarkCycles = server.system.environment.BENCHMARK_CYCLES ?: "";
+ javaDistribution = server.system.environment.JAVA_DISTRIBUTION ?: "";
+ benchmarkCycles = server.system.environment.BENCHMARK_CYCLES ?: "";
_logger( "## Summary Report" );
@@ -73,7 +73,7 @@
loop list="#filter.suites#" item="type" {
```
- select version, java, time,
+ select version, java, time,
throughput, _perc, _min, _avg, _med, _max, memory, error
from q
where type =
@@ -86,24 +86,24 @@
arrayAppend( winners[ q_win.version ], type );
}
_logger( "" );
- _logger( "## Benchmark Winners by Version");
+ _logger( "#### Benchmark Winners by Version");
_logger( "" );
hdr = [ "Version", "Test(s)"];
div = [ "---", "---"];
_logger( "|" & arrayToList( hdr, "|" ) & "|" );
_logger( "|" & arrayToList( div, "|" ) & "|" );
loop collection=winners key="winner" value="wins"{
- _logger("|" & winner & "|" & wrap(arrayToList(wins, ', '),100) & "|" );
+ _logger("|" & winner & "|"
+ & benchmarkUtils.markdownEscape( wrap( arrayToList( wins, ', ' ), 100 ) ) & "|" );
}
_logger( "" );
- abort;
// report out per test
loop list="never,once" item="inspect" {
loop list="#filter.suites#" item="type" {
```
- select version, java, time,
+ select version, java, time,
throughput, _perc, _min, _avg, _med, _max, memory, error
from q
where type =
@@ -117,7 +117,7 @@
}
if (exeLog == "debug"){
- _logger( "## Execution Log Cross Reference" );
+ _logger( "#### Execution Log Cross Reference" );
_logger( "" );
if ( structCount( tests ) ){
for ( type in tests ){
@@ -136,7 +136,7 @@
_logger( "No exeLog data found" );
}
-
+
}
@@ -156,23 +156,23 @@
-
-
+ scaleFrom="#throughput_range.min#" scaleTo="#throughput_range.max#">
+
-
+
-
+
-
+
>
-
+
-
-
+
+
_logger( "#### Inspect #UCase( _inspect )# Benchmarks - #runs# runs" );
@@ -182,15 +182,15 @@
-
-
+ scaleFrom="#mem_range.min#" scaleTo="#mem_range.max#">
+
-
+
-
+