Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor CompilationStrategy and CompilationController #16700

Merged
merged 1 commit into from
Mar 29, 2023
Merged

Refactor CompilationStrategy and CompilationController #16700

merged 1 commit into from
Mar 29, 2023

Conversation

jamesgua
Copy link
Contributor

  • using CompilationController directly from OMR
  • making CompilationStrategy extensible class

Signed-off-by: Tao Guan james_mango@yahoo.com

@jamesgua jamesgua force-pushed the extendCompCtrl branch 5 times, most recently from ffeb6a8 to 3ecd030 Compare February 14, 2023 15:45
@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 1, 2023

I believe this requires a coordinated merge with eclipse/omr#6884

@jamesgua jamesgua mentioned this pull request Mar 1, 2023
Merged
@jamesgua jamesgua force-pushed the extendCompCtrl branch 3 times, most recently from 04f02d4 to cb7c7c0 Compare March 7, 2023 02:22
@jamesgua jamesgua force-pushed the extendCompCtrl branch 2 times, most recently from c45e31c to f0e396f Compare March 9, 2023 01:46
mpirvu
mpirvu approved these changes Mar 10, 2023
View reviewed changes
Copy link
Contributor

@mpirvu mpirvu left a comment

Choose a reason for hiding this comment

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

LGTM

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 14, 2023

Jenkins test sanity all jdk8,jdk11,jdk17 depends eclipse/omr#6884

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 14, 2023

@jamesgua : there are some build failures on Windows. For example,

https://openj9-jenkins.osuosl.org/job/Build_JDK8_x86-64_windows_Personal/841/consoleText

[2023-03-14T15:01:51.965Z] F:\Users\jenkins\workspace\Build_JDK8_x86-64_windows_Personal\omr\compiler\control\CompilationController.cpp(61): error C2039: 'compilation': is not a member of 'TR'
[2023-03-14T15:01:51.965Z] F:\Users\jenkins\workspace\Build_JDK8_x86-64_windows_Personal\openj9\runtime\compiler\control/CompilationStrategy.hpp(28): note: see declaration of 'TR'
[2023-03-14T15:01:51.965Z] F:\Users\jenkins\workspace\Build_JDK8_x86-64_windows_Personal\omr\compiler\control\CompilationController.cpp(61): error C2065: 'compilation': undeclared identifier
[2023-03-14T15:01:51.965Z] F:\Users\jenkins\workspace\Build_JDK8_x86-64_windows_Personal\omr\compiler\control\CompilationController.cpp(70): error C2039: 'compilation': is not a member of 'TR'
[2023-03-14T15:01:51.965Z] F:\Users\jenkins\workspace\Build_JDK8_x86-64_windows_Personal\openj9\runtime\compiler\control/CompilationStrategy.hpp(28): note: see declaration of 'TR'
[2023-03-14T15:01:51.965Z] F:\Users\jenkins\workspace\Build_JDK8_x86-64_windows_Personal\omr\compiler\control\CompilationController.cpp(70): error C2065: 'compilation': undeclared identifier
[2023-03-14T15:01:51.965Z] make[4]: *** [runtime/compiler/CMakeFiles/j9jit.dir/build.make:3547: runtime/compiler/CMakeFiles/j9jit.dir/49cc88ef8916a98e053ba6158b172f3d/omr/compiler/control/CompilationController.cpp.obj] Error 2

@jamesgua
Copy link
Contributor Author

Update in OMR - TR::compilation corrected to TR::Compilation, pls rerun the build. Thx!

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 15, 2023

Jenkins test sanity all jdk8,jdk11,jdk17 depends eclipse/omr#6884

1 similar comment
@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 15, 2023

Jenkins test sanity all jdk8,jdk11,jdk17 depends eclipse/omr#6884

@0xdaryl 0xdaryl self-assigned this Mar 20, 2023
@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 20, 2023

Jenkins test sanity zlinux jdk11 depends eclipse/omr#6884

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 25, 2023

Jenkins test sanity,sanity.openjdk all jdk8,jdk11,jdk17 depends eclipse/omr#6884

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 26, 2023

Jenkins test sanity.functional plinux jdk8,jdk11,jdk17

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 26, 2023

Jenkins test sanity.openjdk plinux jdk8,jdk11

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 26, 2023

Lone Z failure appears to be #12582

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 27, 2023

Jenkins test sanity.functional plinux jdk8,jdk11,jdk17 depends eclipse/omr#6884

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 27, 2023

Jenkins test sanity.openjdk plinux jdk8,jdk11 depends eclipse/omr#6884

@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 27, 2023

Jenkins test sanity.functional plinux jdk17 depends eclipse/omr#6884

Looks like an infra issue. Retrying.

0xdaryl
0xdaryl reviewed Mar 28, 2023
View reviewed changes
runtime/compiler/build/files/common.mk
@@ -380,6 +379,7 @@ JIT_PRODUCT_SOURCE_FILES+=\
compiler/runtime/ValueProfiler.cpp \
compiler/runtime/codertinit.cpp \
compiler/runtime/emfloat.c \
omr/compiler/control/CompilationController.cpp \
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, just discovered this. You will also need to add the new file compiler/control/J9CompilationStrategy.cpp to this file.

As this does not affect builds in the open project I don't need to re-run all the tests and will just re-run a private build instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Change updated, pls take another look.

@jamesgua
Refactor CompilationStrategy and CompilationController
fb9b96a 
    using CompilationController directly from OMR
    making CompilationStrategy extensible class
    rename DefaultCompilationStrategy to CompilationStrategy
    use self method to dereference member method

Signed-off-by: Tao Guan <jamesgua@ca.ibm.com>
@0xdaryl
Copy link
Contributor

0xdaryl commented Mar 28, 2023

For the record, all previous acceptance testing run on this PR with its OMR dependency was successful.

0xdaryl
0xdaryl approved these changes Mar 28, 2023
View reviewed changes
Copy link
Contributor

@0xdaryl 0xdaryl left a comment

Choose a reason for hiding this comment

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

UMA build was successful.

@0xdaryl 0xdaryl merged commit 7f984da into eclipse-openj9:master Mar 29, 2023
@jamesgua jamesgua deleted the extendCompCtrl branch March 29, 2023 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xdaryl 0xdaryl 0xdaryl approved these changes

@mpirvu mpirvu mpirvu approved these changes

Assignees

@0xdaryl 0xdaryl

Labels
depends:omr:breaking
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jamesgua @0xdaryl @mpirvu