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

Simplify CPUFeatures code #112

Closed

Conversation

jankratochvil
Copy link
Contributor

@jankratochvil jankratochvil commented Sep 16, 2023

There is no functionality change. I guess the new code should be more simple and shorter. It was originally suggested by @AntonKozlov to use more functions than macros.

 1 file changed, 44 insertions(+), 82 deletions(-)

So I find it clearly an improvement.
The readable sub-commit is: 6d9cb72
Otherwise it gets messed up by the other commit just renaming things.
As an explanation: Original code had two lists of the same CPU features. An EXCESSIVE list and an GLIBC_DISABLE list. The had to be kept in sync (their sets being equal) which was sanity checked:

    if (PASTE_TOKENS(disable_handled_, kind) != PASTE_TOKENS(excessive_handled_, kind))                                                  \

So now there is the list just once (EXCESSIVE, the GLIBC_DISABLE one has been deleted). It looks stupid but when coding it I did not see it.
Coding both variants of #136 was needlessly more difficult without this pull request applied and now I have to rebase this pull request.


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 112

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/crac/pull/112.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 16, 2023

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

@openjdk
Copy link

openjdk bot commented Sep 16, 2023

@jankratochvil 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:

Simplify CPUFeatures code

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 no new commits pushed to the crac branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 16, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 16, 2023

Webrevs

@rvansa
Copy link
Collaborator

rvansa commented Sep 25, 2023

As much as I'd like to keep the PR queue short I am unfamiliar with this part of codebase, I'll leave the review up to @AntonKozlov since he did the review last time.

@jankratochvil
Copy link
Contributor Author

Please note the changes are split into two different commits to make the review easier.

@openjdk
Copy link

openjdk bot commented Nov 16, 2023

@jankratochvil this pull request can not be integrated into crac due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout crac-cpufeaturessimplify
git fetch https://git.openjdk.org/crac.git crac
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge crac"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Nov 16, 2023
@jankratochvil jankratochvil marked this pull request as draft November 16, 2023 12:42
@jankratochvil
Copy link
Contributor Author

Converted it to draft until #139 gets accepted.

@openjdk openjdk bot removed the rfr Pull request is ready for review label Nov 16, 2023
@jankratochvil jankratochvil mentioned this pull request Dec 8, 2023
1 task
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 11, 2024

@jankratochvil This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 7, 2024

@jankratochvil This pull request has been inactive for more than 16 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

@bridgekeeper bridgekeeper bot closed this Mar 7, 2024
@jankratochvil
Copy link
Contributor Author

/open

@openjdk openjdk bot reopened this Mar 7, 2024
@openjdk
Copy link

openjdk bot commented Mar 7, 2024

@jankratochvil This pull request is now open

@jankratochvil jankratochvil marked this pull request as ready for review April 9, 2024 12:10
@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch labels Apr 9, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented May 16, 2024

@jankratochvil This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@jankratochvil
Copy link
Contributor Author

I have submitted it downstream, it can bubble up here upstream later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready Pull request is ready to be integrated rfr Pull request is ready for review
2 participants