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

clamp-hsatools: Use lld as the liner for AMDGPU #51

Merged
merged 1 commit into from
May 5, 2016
Merged

clamp-hsatools: Use lld as the liner for AMDGPU #51

merged 1 commit into from
May 5, 2016

Conversation

tstellarAMD
Copy link
Contributor

We need to wait until co-v2 support lands in LLVM before merging this.

@whchung
Copy link
Collaborator

whchung commented May 5, 2016

@tstellarAMD could you help revise the pull request so this goes to "develop" branch?

@whchung whchung closed this May 5, 2016
@tstellarAMD
Copy link
Contributor Author

These needs to go in the master branch, otherwise we will break master when llvm updates to code object v2.

@whchung
Copy link
Collaborator

whchung commented May 5, 2016

@tstellarAMD We are changing to a new branching strategy now. Every new feature goes to develop first. Periodically we'll promote production-ready features to master.

@tstellarAMD
Copy link
Contributor Author

Would it be possible to merge it into both branches? If we only merge it into develop, then master won't work at all with lightning, which would defeat the purpose of having a stable master branch. I think this commit is a special case, because it changes the interface between hcc and lightning. I don't think we are going to have many commits like this.

@whchung
Copy link
Collaborator

whchung commented May 5, 2016

Ok, let me reopen this pull request. Please give me a signal when it's good to me merged into master. I can then cherry-pick it to develop.

@whchung whchung reopened this May 5, 2016
@tstellarAMD
Copy link
Contributor Author

This can be merged now. I'm going to push the LLVM changes in a few minutes.

@whchung
Copy link
Collaborator

whchung commented May 5, 2016

@tstellarAMD are those changes in LLVM side take place in LLVM trunk? could you let me know the commit # so I'm sure my env is up to speed?

@tstellarAMD
Copy link
Contributor Author

It was committed as svn revision r268647.

@whchung
Copy link
Collaborator

whchung commented May 5, 2016

@tstellarAMD In terms of git commit, that's:
llvm-mirror/llvm@66eb4d1
right?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants