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

Merge rL332302, rL332680, rL332682, rL332694 into 6.0.1 #36873

Closed
Keno opened this issue May 18, 2018 · 12 comments
Closed

Merge rL332302, rL332680, rL332682, rL332694 into 6.0.1 #36873

Keno opened this issue May 18, 2018 · 12 comments
Assignees
Labels
bugzilla Issues migrated from bugzilla

Comments

@Keno
Copy link
Member

Keno commented May 18, 2018

Bugzilla Link 37525
Resolution FIXED
Resolved on Jun 11, 2018 16:24
Version 6.0
OS All
Blocks #35997
CC @topperc,@arsenm,@tstellar,@vchuravy
Fixed by commit(s) r332680 r332682 r332694 r333469 r333470 r333477

Extended Description

Please merge the following revisions into 6.0.1. They fix crashing bugs in
the julia test suite after the upgrade to LLVM 6.0:

rL332302 [InstCombine] fix crash due to ignored addrspacecast (Reviewer: arsenm)
rL332680 [X86DomainReassignment] Don't delete IMPLICIT_DEF nodes (Reviewer: craig.topper)
rL332682 [X86DomainReassignment] Don't compare stack-allocated values by address (Reviewer: craig.topper)
rL332694 [X86DomainReassignment] Hopefully fix buildbot failure (no reviewer, but just a typo fix in the test case for the previous one - can be squashed into that for the cherry-pick)

@Keno
Copy link
Member Author

Keno commented May 18, 2018

assigned to @majnemer

@tstellar
Copy link
Collaborator

@topperc
Copy link
Collaborator

topperc commented May 18, 2018

Yes, they are ok to merge. Thanks!

@tstellar
Copy link
Collaborator

Hi Craig,

Are these X86 patches OK to merge?

http://reviews.llvm.org/rL332680
http://reviews.llvm.org/rL332682
http://reviews.llvm.org/rL332694

Keno, I tried merging these patches, but the domain-reassignment-test.ll fails, can you try merging these?

@Keno
Copy link
Member Author

Keno commented May 26, 2018

Valentin Churavy has a version of these patches that he rebased against 6.0 and we're using for Julia:

https://github.com/staticfloat/LLVMBuilder/blob/master/patches/llvm_patches/0014-llvm-rL332680.patch
https://github.com/staticfloat/LLVMBuilder/blob/master/patches/llvm_patches/0015-llvm-rL332682.patch
https://github.com/staticfloat/LLVMBuilder/blob/master/patches/llvm_patches/0016-llvm-rL332302.patch
https://github.com/staticfloat/LLVMBuilder/blob/master/patches/llvm_patches/0017-llvm-rL332694.patch

Maybe try those. I can also try doing it, but I'm not sure how to commit to the release branch, so in that case, I may need you to provide instructions.

@topperc
Copy link
Collaborator

topperc commented May 26, 2018

Will merging r324497 first make the other patches apply correctly? That patch regenerated the test with the update_mir_test script.

@tstellar
Copy link
Collaborator

Will merging r324497 first make the other patches apply correctly? That
patch regenerated the test with the update_mir_test script.

That patch was is already in the release_60 branch.

@tstellar
Copy link
Collaborator

I was able to fix the test. I had to add -mcpu=skylake-avx512 to the llvm-mc invocation in the domain-reassignment-test.ll test.

@tstellar
Copy link
Collaborator

I've merged the X86 commits as r333469 and r333470 (I squashed the last to into one commit).

@tstellar
Copy link
Collaborator

Hi David,

What do you think about the InstCombine patch:

https://reviews.llvm.org/rL332302

@majnemer
Copy link
Mannequin

majnemer mannequin commented May 29, 2018

Hi David,

What do you think about the InstCombine patch:

https://reviews.llvm.org/rL332302

LGTM

@tstellar
Copy link
Collaborator

Merged the InstCombine fix: r333477

@llvmbot llvmbot transferred this issue from llvm/llvm-bugzilla-archive Dec 10, 2021
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugzilla Issues migrated from bugzilla
Projects
None yet
Development

No branches or pull requests

3 participants