Skip to content

Get dacapo-h2 metric and store in a file#6339

Merged
llxia merged 8 commits intoadoptium:masterfrom
MattyWeee123:issue6327
Jun 17, 2025
Merged

Get dacapo-h2 metric and store in a file#6339
llxia merged 8 commits intoadoptium:masterfrom
MattyWeee123:issue6327

Conversation

@MattyWeee123
Copy link
Copy Markdown
Contributor

@MattyWeee123 MattyWeee123 commented Jun 15, 2025

Use java regex to parse the dacapo runtime log, reformat it into a JSON style metric log, and archive it in Jenkins.

Fixes: #6327

@MattyWeee123 MattyWeee123 reopened this Jun 15, 2025
@MattyWeee123 MattyWeee123 marked this pull request as ready for review June 15, 2025 05:00
Copy link
Copy Markdown
Contributor

@karianna karianna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 nitpicks then over to one of the test team reviewers

Copy link
Copy Markdown
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR contains 55 commits. Please rebase the branch to remove other people's commits. Thanks

Reset to current upstream, added relevant changes
for this issue.

Fixes: adoptium#6327

Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>
@MattyWeee123
Copy link
Copy Markdown
Contributor Author

MattyWeee123 commented Jun 17, 2025

Updated to a single commit

}
}

checkDacapoH2Metric()
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be wrapped around

if (env.BUILD_LIST.startsWith('perf')) {

...

}

@llxia
Copy link
Copy Markdown
Contributor

llxia commented Jun 17, 2025

Please run a Grinder with your changes. And use the git keyword to relate to the issue. See https://github.com/adoptium/aqa-tests/blob/master/Contributing.md for details. Thanks

@MattyWeee123
Copy link
Copy Markdown
Contributor Author

MattyWeee123 commented Jun 17, 2025

Grinder

As expected, the h2 metric is found and archived when h2 passes, otherwise the console indicates that it is not found and does not archive.

Some tests failed/hanged but I don't think that's me, as all I did was use a logMatcher after all the tests were run? This is also using the old dacapo jar.

def archiveDacapoH2Metric(runtime) {
def fileName = "${env.JOB_NAME}_${env.BUILD_NUMBER}.log"
def jsonData = [
"Benchmark": "dacapo-h2",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad. Please keep Benchmark in a lowercase -> benchmark

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@llxia
Copy link
Copy Markdown
Contributor

llxia commented Jun 17, 2025

Just for the record, https://ci.adoptium.net/job/Grinder/13469/console

00:02:12.847  Completed 4000 transactions
00:02:12.847  	Stock level .............   155 ( 3.9%)
00:02:12.847  	Order status by name ....   108 ( 2.7%)
00:02:12.847  	Order status by ID ......    65 ( 1.6%)
00:02:12.847  	Payment by name .........  1050 (26.2%)
00:02:12.847  	Payment by ID ...........   661 (16.5%)
00:02:12.847  	Delivery schedule .......   167 ( 4.2%)
00:02:12.847  	New order ...............  1774 (44.4%)
00:02:12.847  	New order rollback ......    20 ( 0.5%)
00:02:12.847  Resetting database to initial state
00:02:14.300  ===== DaCapo 9.12-MR1 h2 PASSED in 6615 msec =====

json file: https://ci.adoptium.net/job/Grinder/13469/artifact/Grinder_13469.log/*view*/

{
Benchmark: "dacapo-h2",
metrics: {
dacapo-h2: [
{
value: "6615"
},
{
higherbetter: true
},
{
units: "msec"
}
]
}
}

Thanks @MattyWeee123 . Looks good :)


return this
def checkDacapoH2Metric() {
def regex = ".*=====\\sDaCapo.*?h2\\sPASSED\\sin\\s(\\d*\\.?\\d*)\\smsec\\s=====\\s*\$"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpicking: Please use the same indentation as the rest of the file. I think tab is used (not space)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Copy link
Copy Markdown
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @MattyWeee123

@llxia llxia merged commit 7d0e018 into adoptium:master Jun 17, 2025
2 checks passed
@MattyWeee123 MattyWeee123 deleted the issue6327 branch June 22, 2025 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Get dacapo-h2 metric and store in a file

3 participants