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

JDK-8288824: [arm32] Display isetstate in register output #9223

Closed
wants to merge 1 commit into from

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Jun 21, 2022

When analyzing JDK-8288719, to know the current isetstate was useful. It would be nice if that were printed clearly in the register output to save some mental cycles parsing CPSR.

Looks like this:

Registers:
  r0  = 0x00000000
  r1  = 0xbe9e7fb8
  r2  = 0x00000000
  r3  = 0xb6f860ac
  r4  = 0xbe9e7fb8
  r5  = 0xb6f864e0
  r6  = 0xbe9e8060
  r7  = 0xbe9e7fb0
  r8  = 0xb6da8798
  r9  = 0x00000000
  r10 = 0x00000000
  fp  = 0x00000001
  r12 = 0xb6da87ec
  sp  = 0xbe9e7fb0
  lr  = 0xb6bc7dfb
  pc  = 0xb6bc7dfa
  cpsr = 0x800e0030
isetstate: Thumb

Registers:
  r0  = 0xb6be3664
  r1  = 0xbe947c70
  r2  = 0x00000058
  r3  = 0xb6f3e000
  r4  = 0xbe947c70
  r5  = 0xb6f3f510
  r6  = 0xb6c95bdc
  r7  = 0xbe947d18
  r8  = 0xbe947d98
  r9  = 0x00000000
  r10 = 0x00000000
  fp  = 0xbe947d14
  r12 = 0xb6c95f84
  sp  = 0xbe947c68
  lr  = 0xb6e97218
  pc  = 0xb6793f3c
  cpsr = 0x60000010
isetstate: ARM 

I refrained from parsing more information from the CPSR because I did not want to blow up the patch. ISETSTATE proved to be useful. More information can be added if needed.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8288824: [arm32] Display isetstate in register output

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9223/head:pull/9223
$ git checkout pull/9223

Update a local copy of the PR:
$ git checkout pull/9223
$ git pull https://git.openjdk.org/jdk pull/9223/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9223

View PR using the GUI difftool:
$ git pr show -t 9223

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9223.diff

@tstuefe tstuefe marked this pull request as ready for review June 21, 2022 08:26
@tstuefe
Copy link
Member Author

tstuefe commented Jun 21, 2022

/label: hotspot

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2022

👋 Welcome back stuefe! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 21, 2022
@openjdk
Copy link

openjdk bot commented Jun 21, 2022

@tstuefe The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 21, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2022

Webrevs

@tstuefe
Copy link
Member Author

tstuefe commented Jul 3, 2022

Gentle ping

case 1: st->print_cr("Thumb"); break;
case 2: st->print_cr("Jazelle"); break;
case 3: st->print_cr("ThumbEE"); break;
default: ShouldNotReachHere();

Choose a reason for hiding this comment

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

Should we print here something like "undefined" rather than abort VM?

Copy link
Member Author

Choose a reason for hiding this comment

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

Hi Dmitry,

I think this cannot happen, since isetstate is the combination of two bits (see line 451 ff). So an assert would be correct here, since this can only fire if we break that assumption by changing isetstate with a future patch.

But I am unemotional. If you prefer not to assert, I can use "undefined".

Cheers, Thomas

Choose a reason for hiding this comment

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

Thank you for the explanation. I'm OK with current changes.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks Dmitry!

@openjdk
Copy link

openjdk bot commented Jul 5, 2022

@tstuefe This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8288824: [arm32] Display isetstate in register output

Reviewed-by: dsamersoff, snazarki

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 185 new commits pushed to the master branch:

  • 83a5d59: 8278479: RunThese test failure with +UseHeavyMonitors and +VerifyHeavyMonitors
  • cbaf6e8: 8288022: c2: Transform (CastLL (AddL into (AddL (CastLL when possible
  • 8341895: 8289739: Add G1 specific GC breakpoints for testing
  • ac6be16: 8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun
  • 4ad18cf: 8289730: Deprecated code sample in java.lang.ClassCastException
  • d8f4e97: 8289146: containers/docker/TestMemoryWithCgroupV1.java fails on linux ppc64le machine with missing Memory and Swap Limit output
  • f783244: 8289706: (cs) Avoid redundant TreeMap.containsKey call in AbstractCharsetProvider
  • fafe8b3: 8289604: compiler/vectorapi/VectorLogicalOpIdentityTest.java failed on x86 AVX1 system
  • 3515604: 8280481: Duplicated stubs to interpreter for static calls
  • d48694d: 8283335: Add exists and readAttributesIfExists methods to FileSystemProvider
  • ... and 175 more: https://git.openjdk.org/jdk/compare/ad8914616bd63f628e5b6472f1f48315dacfbc94...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 5, 2022
@tstuefe
Copy link
Member Author

tstuefe commented Jul 5, 2022

@kristylee88 are you a real person or a bot? I only see a number of comment-less approvals and no indication that you actually read the sources.

@tstuefe
Copy link
Member Author

tstuefe commented Jul 5, 2022

@snazarkin could you take a look? Its a small patch, and there are not many arm32 reviewers around it seems. Thanks!

@snazarkin
Copy link
Contributor

@tstuefe Good idea, thank you. LGTM

@tstuefe
Copy link
Member Author

tstuefe commented Jul 6, 2022

Thanks @dsamersoff and @snazarkin .

/integrate

@openjdk
Copy link

openjdk bot commented Jul 6, 2022

Going to push as commit 75c0a5b.
Since your change was applied there have been 185 commits pushed to the master branch:

  • 83a5d59: 8278479: RunThese test failure with +UseHeavyMonitors and +VerifyHeavyMonitors
  • cbaf6e8: 8288022: c2: Transform (CastLL (AddL into (AddL (CastLL when possible
  • 8341895: 8289739: Add G1 specific GC breakpoints for testing
  • ac6be16: 8289695: [TESTBUG] TestMemoryAwareness.java fails on cgroups v2 and crun
  • 4ad18cf: 8289730: Deprecated code sample in java.lang.ClassCastException
  • d8f4e97: 8289146: containers/docker/TestMemoryWithCgroupV1.java fails on linux ppc64le machine with missing Memory and Swap Limit output
  • f783244: 8289706: (cs) Avoid redundant TreeMap.containsKey call in AbstractCharsetProvider
  • fafe8b3: 8289604: compiler/vectorapi/VectorLogicalOpIdentityTest.java failed on x86 AVX1 system
  • 3515604: 8280481: Duplicated stubs to interpreter for static calls
  • d48694d: 8283335: Add exists and readAttributesIfExists methods to FileSystemProvider
  • ... and 175 more: https://git.openjdk.org/jdk/compare/ad8914616bd63f628e5b6472f1f48315dacfbc94...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 6, 2022
@openjdk openjdk bot closed this Jul 6, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 6, 2022
@openjdk
Copy link

openjdk bot commented Jul 6, 2022

@tstuefe Pushed as commit 75c0a5b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants