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

libclc: 2017-11-29 -> 2019-06-09 #62890

Merged
merged 1 commit into from Feb 14, 2020
Merged

libclc: 2017-11-29 -> 2019-06-09 #62890

merged 1 commit into from Feb 14, 2020

Conversation

@athas
Copy link
Contributor

athas commented Jun 9, 2019

Motivation for this change

The old version does not compile at all with the current default LLVM in Nixpkgs. This one does.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@matthewbauer

This comment has been minimized.

Copy link
Member

matthewbauer commented Jun 12, 2019

@GrahamcOfBorg build libclc

@aanderse

This comment has been minimized.

Copy link
Contributor

aanderse commented Aug 31, 2019

@athas can you please address the build failure?

@athas

This comment has been minimized.

Copy link
Contributor Author

athas commented Aug 31, 2019

I don't know why it's trying to build for aarch64. The targets libclc lists as supported are all NVIDIA and AMD GPU architectures. Is there a way to find out whether the current libclc used to build on aarch64? (It certainly doesn't now - it does not build on anything.)

@yorickvP

This comment has been minimized.

Copy link
Contributor

yorickvP commented Sep 17, 2019

platforms.x86_64?

@athas

This comment has been minimized.

Copy link
Contributor Author

athas commented Oct 2, 2019

If the aarch64 failure is a blocker for 19.09 (note the current libclc does not work at all on any platform), I recommend just disabling aarch64 (no idea how). I have no way to debug it, since I do not have access to an aarch64 machine.

@athas athas force-pushed the athas:libclc-2019-06-09 branch 2 times, most recently from c81d074 to b4d2f3b Oct 8, 2019
@athas

This comment has been minimized.

Copy link
Contributor Author

athas commented Oct 8, 2019

I managed to find an aarch64 machine and fix the issue, I think.

@athas

This comment has been minimized.

Copy link
Contributor Author

athas commented Oct 8, 2019

Relevant for #68361.

@aanderse

This comment has been minimized.

Copy link
Contributor

aanderse commented Oct 12, 2019

@GrahamcOfBorg build libclc

@aanderse

This comment has been minimized.

Copy link
Contributor

aanderse commented Oct 12, 2019

@athas please rebase on master and remove the broken bit.

@athas athas force-pushed the athas:libclc-2019-06-09 branch from b4d2f3b to fe91851 Oct 13, 2019
@athas

This comment has been minimized.

Copy link
Contributor Author

athas commented Oct 13, 2019

Done!

@aanderse

This comment has been minimized.

Copy link
Contributor

aanderse commented Oct 13, 2019

@athas looks like there are still issues.

@athas athas force-pushed the athas:libclc-2019-06-09 branch from fe91851 to 449e241 Oct 13, 2019
@athas

This comment has been minimized.

Copy link
Contributor Author

athas commented Oct 13, 2019

Looks like some of my changes got lost in the rebase. Should work now.

@aanderse

This comment has been minimized.

Copy link
Contributor

aanderse commented Oct 13, 2019

@athas looks like something else went wrong with your push: undefined variable 'clang-unwrapped'

@athas athas force-pushed the athas:libclc-2019-06-09 branch from 449e241 to a0b1547 Oct 13, 2019
@athas

This comment has been minimized.

Copy link
Contributor Author

athas commented Oct 13, 2019

Alright, check it out now.

@aanderse

This comment has been minimized.

Copy link
Contributor

aanderse commented Oct 14, 2019

@matthewbauer are you familiar with this library at all? If so... care to take over from here? 😄

@athas

This comment has been minimized.

Copy link
Contributor Author

athas commented Feb 8, 2020

Any news here? As stated in the original PR, the current libclc simply doesn't work (and is barely used for anything; my motivation is eventually fixing Mesa), so this cannot possibly go wrong.

@vcunat

This comment has been minimized.

Copy link
Member

vcunat commented Feb 14, 2020

Let's re-check the builds.
@GrahamcOfBorg build libclc

@vcunat

This comment has been minimized.

Copy link
Member

vcunat commented Feb 14, 2020

It seems a bit suspicious to use wrapped bin/clang++ and unwrapped bin/clang, but if it seems to work, it's surely better than a package that doesn't even build.

@vcunat
vcunat approved these changes Feb 14, 2020
vcunat added a commit that referenced this pull request Feb 14, 2020
@danbst danbst merged commit a0b1547 into NixOS:master Feb 14, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
libclc on aarch64-linux Success
Details
libclc on x86_64-darwin Success
Details
libclc on x86_64-linux Success
Details
vcunat added a commit that referenced this pull request Feb 14, 2020
(cherry picked from commit ed77cf1)
vcunat added a commit that referenced this pull request Feb 14, 2020
(cherry picked from commit ed77cf1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.