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.

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

Clean up references to old opcodes #7519

Merged

Conversation

a7ehuo
Copy link
Contributor

@a7ehuo a7ehuo commented Nov 1, 2024

The old opcodes had the letter i as a prefix if the operation was indirect. Those opcodes were renamed to use the letter as a suffix instead.

This commit cleans up the references to the old opcodes, iiload/iistore ilload/ilstore iaload/iastore ibload/ibstore, to iloadi/istorei lloadi/lstorei aloadi/astorei bloadi/bstorei in the code comments and trace messages.

Related: eclipse-openj9/openj9#19489

@a7ehuo
Copy link
Contributor Author

a7ehuo commented Nov 1, 2024

@hzongaro May I ask you to review this change? Thank you very much!

This is the first set of change that cleans up the old references in the comments or traces. I'll have another change that cleans up the old references in the code itself.

@0xdaryl
Copy link
Contributor

0xdaryl commented Nov 2, 2024

Jenkins build all

@hzongaro hzongaro self-assigned this Nov 4, 2024
Copy link
Contributor

@hzongaro hzongaro left a comment

Choose a reason for hiding this comment

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

I think the changes look good, and it looks like you've caught all of the cases where the old opcode names appeared in comments and trace messages.

May I ask you to adjust the commit comment to reduce the length of the first line to less than 70 characters, and also mention in the commit comment the reason for the change?

The old opcodes had the letter i as a prefix if the operation
was indirect. Those opcodes were renamed to use the letter i
as a suffix instead.

This commit cleans up the references to the old opcodes,
iiload/iistore ilload/ilstore iaload/iastore ibload/ibstore,
to iloadi/istorei lloadi/lstorei aloadi/astorei bloadi/bstorei
in the code comments and trace messages.

Related: eclipse-openj9/openj9#19489
Signed-off-by: Annabelle Huo <[email protected]>
@a7ehuo a7ehuo force-pushed the techdebt-cleanup-opcode-comments branch from 2b87ea2 to 6e681da Compare November 4, 2024 14:43
@a7ehuo a7ehuo changed the title Clean up references to iiload/iistore ilload/ilstore iaload/iastore ibload/ibstore Clean up references to old opcodes Nov 4, 2024
@a7ehuo
Copy link
Contributor Author

a7ehuo commented Nov 4, 2024

@hzongaro All comments addressed in 6e681da. Ready for another review. Thank you!

Copy link
Contributor

@hzongaro hzongaro left a comment

Choose a reason for hiding this comment

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

I just realized that this change handles references to indirect loads and stores for 8-bit, 32-bit and 64-bit integer values, but not 16-bit — that is, isload and isstore should become sloadi and sstorei respectively. I've pointed out a couple of examples. Did you intend to handle those in this pull request or were you planning on opening a separate pull request for them? Of course you'll have to distinguish cases where code is speaking of whether something is a load or store from cases where it's talking about indirect short load and store operations.

Also, I noticed references to idload and idstore in comments in VPHandlers.cpp

compiler/optimizer/LoopReducer.cpp Show resolved Hide resolved
compiler/optimizer/LoopReducer.cpp Show resolved Hide resolved
@a7ehuo
Copy link
Contributor Author

a7ehuo commented Nov 4, 2024

Did you intend to handle those in this pull request or were you planning on opening a separate pull request for them?

I plan to handle the rest of the opcodes, isload/isstore, ifload/ifstore, idload/idstore, in future pull requests. This clean up work touches a lot of files and there will be dependencies between OMR and OpenJ9 as well when it comes to updating the code itself. Breaking them up in multiple PRs makes the test and review easier. My plan is

Step 1. Clean up iiload/iistore ilload/ilstore iaload/iastore ibload/ibstore in the code comments and trace messages in OMR
Step 2. Clean up iiload/iistore ilload/ilstore iaload/iastore ibload/ibstore in the code comments and trace messages in OpenJ9
Step 3. Clean up iiload/iistore ilload/ilstore iaload/iastore ibload/ibstore in the code itself in OMR and OpenJ9
Step 4. Clean up isload/isstore, ifload/ifstore, idload/idstore in the code comments and trace messages in OMR
Step 5. Clean up isload/isstore, ifload/ifstore, idload/idstore in the code comments and trace messages in OpenJ9
Step 6. Clean up isload/isstore, ifload/ifstore, idload/idstore in the code itself in OMR and OpenJ9

Copy link
Contributor

@hzongaro hzongaro left a comment

Choose a reason for hiding this comment

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

Changes look good. Thanks!

@hzongaro
Copy link
Contributor

hzongaro commented Nov 4, 2024

The only change since the previous build was run was in the commit comments. That build was successful, so merging.

@hzongaro hzongaro merged commit 6fa1806 into eclipse-omr:master Nov 4, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants