Leverage getDependencies for dacapo.zip by MattyWeee123 · Pull Request #6337 · adoptium/aqa-tests

MattyWeee123 · 2025-06-14T02:22:39Z

Save dacapo minimal 23.11 via getDependencies.pl from TKG to use in dacapo/build.xml from aqa-tests.

buildenv/jenkins/JenkinsfileBase

perf/dacapo/build.xml

Reset to current upstream, added relevant changes for the issue and removed -L since we are including in getDependencies.pl dacapo dependency link. Fixes: #issue6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

llxia · 2025-06-18T16:00:53Z

perf/dacapo/build.xml

+        <target name="getDependentLibs">
+        <exec executable="perl" failonerror="true">
+                <arg line="${TEST_ROOT}/TKG/scripts/getDependencies.pl -path ${LIB_DIR} -task default -dependencyList ${LIB}"/>
+        </exec>
+        </target> 


This is not needed. getDependentLibs is a pre-defined target.
By calling getDependentLibs at Line 41, you will get dacapo.zip.

When you say predefined, are you referring to the getDependentLibs target defined in "${TEST_ROOT}/TKG/scripts/getDependencies.xml", or do I get it for free without importing anything?

You will get it for free by importing the getDependencies.xml

<property name="LIB" value="dacapo"/> <import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/> and calling `getDependentLibs` at line 41

llxia · 2025-06-18T16:05:05Z

Please test this PR with TKG PR adoptium/TKG#713 together in Grinder. By setting the following:
ADOPTOPENJDK_REPO
ADOPTOPENJDK_BRANCH
TKG_OWNER_BRANCH

llxia · 2025-06-18T16:06:03Z

perf/dacapo/build.xml

+				<unzip src="${DEPENDENCY_FNAME}" dest="${SRC}"/>
+				<move file="${DACAPO_DIR_NAME}.jar" tofile="${FILE_NAME}" failonerror="true"/>
+				<move todir="${DIR_NAME}" failonerror="true">
+					<fileset dir="${DACAPO_DIR_NAME}"/>
+				</move>
+				<delete file="${DEPENDENCY_FNAME}"/>


This logic will need to be updated. As mentioned in https://github.com/adoptium/aqa-tests/pull/6337/files#r2154987545, you will get dacapo.zip directly.

If I get dacapo.zip directly, won't I still have to extract the contents and rename them accordingly?

ic, I thought you were renaming the original zip. But this is renaming dacapo-23.11-MR2-chopin-minimal.jar within the dacapo.zip. Yes, you do need to unzip and rename in this case.

I do not think you need get_zip.

Tested with branch issue6326 and TKG710. Removed debugging code. get_zip needs to stay, since getDependentLibs moves dacapo.zip to LIB_DIR not SRC. Using getDepdencies.xml import instead of executing shell command. -L in the TKG hash dependency link works as expected. Fixes: adoptium#6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

MattyWeee123 · 2025-06-18T19:24:33Z

Grinder

Successfully passes on grinder, the few unstable builds are resolved in #6331.

llxia · 2025-06-18T19:46:42Z

perf/dacapo/build.xml

+                <copy todir="${SRC}">
+                        <fileset dir="${LIB_DIR}/" includes="${DEPENDENCY_FNAME}"/>
+		</copy>


Can we just directly unzip into DEST dir at line 50? (Instead of copying the zip into the SRC dir, then unzipping in SRC dir, and removing zip and copying SRC dir to DEST dir). I would like to reduce the copies if possible.

00:01:14.553 getDacapoSuite: 00:01:14.553 [unzip] Expanding: /home/jenkins/workspace/Grinder/aqa-tests/perf/dacapo/dacapo.zip into /home/jenkins/workspace/Grinder/aqa-tests/perf/dacapo 00:01:43.306 [move] Moving 1 file to /home/jenkins/workspace/Grinder/aqa-tests/perf/dacapo 00:01:43.306 [move] Moving 10669 files to /home/jenkins/workspace/Grinder/aqa-tests/perf/dacapo/dacapo 00:01:43.306 [delete] Deleting: /home/jenkins/workspace/Grinder/aqa-tests/perf/dacapo/dacapo.zip 00:01:43.306 00:01:43.306 dist: 00:01:44.754 [copy] Copying 10672 files to /home/jenkins/workspace/Grinder/jvmtest/perf/dacapo 00:02:31.682 [copy] Copied 1931 empty directories to 24 empty directories under /home/jenkins/workspace/Grinder/jvmtest/perf/dacapo

Extracted dacapo.zip directly to dest to reduce large amount of copies. Fixes: adoptium#6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

llxia · 2025-06-19T12:26:47Z

perf/dacapo/build.xml

-					</exec>
-				</sequential>
-			</retry>
+				<unzip src="${DEPENDENCY_FNAME}" dest="${DEST}"/>


Can we do the following?

<unzip src="${LIB_DIR}/${DEPENDENCY_FNAME}" dest="${DEST}"/>

Unzip from LIB_DIR to DEST to miminize copies. Fixes: adoptium#6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

llxia · 2025-06-19T16:45:08Z

perf/dacapo/build.xml

+				<move todir="${DEST}/${DIR_NAME}" failonerror="true">
+					<fileset dir="${DEST}/${DACAPO_DIR_NAME}"/>
+				</move>
+				<delete file="${DEPENDENCY_FNAME}"/>


I do not think we need this delete as the file is no longer in the current dir.

llxia

Thanks @MattyWeee123

Fixes: #issue6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

MattyWeee123 marked this pull request as ready for review June 14, 2025 02:38

karianna requested changes Jun 15, 2025

View reviewed changes

buildenv/jenkins/JenkinsfileBase Outdated Show resolved Hide resolved

perf/dacapo/build.xml Outdated Show resolved Hide resolved

karianna approved these changes Jun 15, 2025

View reviewed changes

karianna requested review from llxia and smlambert June 15, 2025 22:18

llxia mentioned this pull request Jun 17, 2025

Exclude failed dacapo tests #6338

Merged

Only changes dacapo/build.xml, removed -L from shell command.

d6c8e59

Reset to current upstream, added relevant changes for the issue and removed -L since we are including in getDependencies.pl dacapo dependency link. Fixes: #issue6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

MattyWeee123 force-pushed the issue6326 branch from 075cfd9 to d6c8e59 Compare June 17, 2025 16:47

llxia requested changes Jun 18, 2025

View reviewed changes

llxia reviewed Jun 18, 2025

View reviewed changes

MattyWeee123 added 4 commits June 18, 2025 14:21

added debugging messages, using getDependencies.xml

1b78abb

some more debug messages

73c4a3f

switched to ls

de164cd

MattyWeee123 force-pushed the issue6326 branch from 25b992a to db33795 Compare June 18, 2025 19:32

llxia reviewed Jun 18, 2025

View reviewed changes

Unzip to DEST.

4ec1c7d

Extracted dacapo.zip directly to dest to reduce large amount of copies. Fixes: adoptium#6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

llxia reviewed Jun 19, 2025

View reviewed changes

Unzip from LIB_DIR directly.

5229f87

Unzip from LIB_DIR to DEST to miminize copies. Fixes: adoptium#6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

llxia reviewed Jun 19, 2025

View reviewed changes

removed delete

ee81c8b

llxia approved these changes Jun 19, 2025

View reviewed changes

llxia merged commit c2cb304 into adoptium:master Jun 19, 2025
2 checks passed

sophia-guo pushed a commit that referenced this pull request Jun 19, 2025

Leverage getDependencies for dacapo.zip (#6337)

58d76a8

Fixes: #issue6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

MattyWeee123 deleted the issue6326 branch June 22, 2025 21:44

sophia-guo pushed a commit to sophia-guo/openjdk-tests that referenced this pull request Jul 9, 2025

Leverage getDependencies for dacapo.zip (adoptium#6337)

3bd942b

Fixes: #issue6326 Signed-off-by: Matthew Wei <mwei2@andrew.cmu.edu>

This was referenced Sep 8, 2025

Sept 2025 - JDK 25 triage #6555

Closed

dacapo-pmd perf benchmark fails to run on aarch64_windows #6563

Open

jiekang mentioned this pull request Oct 27, 2025

dacapo-avrora_0 fails for JDK 21 #4745

Closed

Uh oh!

Conversation

MattyWeee123 commented Jun 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

llxia Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

llxia commented Jun 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MattyWeee123 commented Jun 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MattyWeee123 Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

llxia left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MattyWeee123 commented Jun 14, 2025 •

edited

Loading

llxia Jun 18, 2025 •

edited

Loading

MattyWeee123 Jun 19, 2025 •

edited

Loading