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

llvmPackages_git.openmp: apply #197674 (fix cross compile) #222903

Merged
merged 1 commit into from
Apr 19, 2023

Conversation

rrbutani
Copy link
Contributor

This was applied to llvmPackages_15 in 81ef82a.

I ended up needing this in #213202 to apply the libclc changes there to llvmPackages_git (like openmp, libclc wants targetLlvm).

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Mar 24, 2023
@rrbutani rrbutani force-pushed the fix/llvm-git-openmp-cross branch from 4b928c1 to 3ff445d Compare March 24, 2023 15:08
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Mar 24, 2023
@rrbutani rrbutani changed the base branch from staging to master April 3, 2023 15:34
@rrbutani rrbutani force-pushed the fix/llvm-git-openmp-cross branch from 3ff445d to bba47c0 Compare April 3, 2023 15:34
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Apr 3, 2023
this was backported to `llvmPackages_15` in
81ef82a
@rrbutani rrbutani force-pushed the fix/llvm-git-openmp-cross branch from bba47c0 to 61b348f Compare April 3, 2023 15:37
@github-actions github-actions bot removed 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog labels Apr 3, 2023
@rrbutani rrbutani marked this pull request as ready for review April 3, 2023 15:50
@rrbutani rrbutani requested a review from matthewbauer as a code owner April 3, 2023 15:50
@RaitoBezarius
Copy link
Member

I'm not sure what to test here, I will try:

@ofborg build pkgsCross.aarch64-multiplatform.llvmPackages_git.openmp

@rrbutani
Copy link
Contributor Author

rrbutani commented Apr 5, 2023

Hmm looks like the FileCheck JSON error from #222220 is back 🙁.

I'll see if I can reproduce locally.


I finally managed to reproduce this locally.

# using `cntr` and `breakpointHook` (set `postCheck` to `exit 4` or something)

cd build/llvm-src-unstable-2022-26-07/llvm/build

# Edit: /var/lib/cntr/build/llvm-src-unstable-2022-26-07/llvm/build/tools/polly/test/lit.site.cfg
# Edit: /var/lib/cntr/build/llvm-src-unstable-2022-26-07/llvm/build/tools/polly/test/Unit/lit.site.cfg
# Edit: /var/lib/cntr/build/llvm-src-unstable-2022-26-07/llvm/build/tools/polly/test/UnitIsl/lit.site.cfg
# Edit: /var/lib/cntr/build/llvm-src-unstable-2022-26-07/llvm/build/utils/lit/lit.site.cfg
# make paths point to `/var/lib/cntr/build`...

python3.10 ./bin/llvm-lit -svj88 --no-progress-bar \
    --param polly_site_config=tools/polly/test/lit.site.cfg \
    --param polly_unit_site_config=tools/polly/test/Unit/lit.site.cfg \
    --param polly_site_config=tools/polly/test/Unit/lit.site.cfg \
    --param polly_site_config=tools/polly/test/UnitIsl/lit.site.cfg \
    tools/polly/test \
    tools/polly/test/Unit \
    tools/polly/test/UnitIsl \
    utils/lit \
    test \
    --filter ScopPassManager

# Running ^ repeatedly is a fast way to reproduce

Sometimes there will be extra lines in gtest produced JSON files; for example, build/tools/polly/unittests/ScopPassManager/ScopPassManagerTests-Polly-Unit-21548-1-3.json:

{
  "tests": 1,
  "failures": 0,
  "disabled": 0,
  "errors": 0,
  "timestamp": "2023-04-10T18:57:23Z",
  "time": "0s",
  "name": "AllTests",
  "testsuites": [
    {
      "name": "ScopPassRegistry",
      "tests": 1,
      "failures": 0,
      "disabled": 0,
      "errors": 0,
      "timestamp": "2023-04-10T18:57:23Z",
      "time": "0s",
      "testsuite": [
        {
          "name": "PrintScopInfo",
          "status": "RUN",
          "result": "COMPLETED",
          "timestamp": "2023-04-10T18:57:23Z",
          "time": "0s",
          "classname": "ScopPassRegistry"
        }
      ]
    }
  ]
}
]
}

(note the two extra lines)

the number of extra lines, contents, etc, are not consistent; sometimes I get:

}
}
  ]
}

@RaitoBezarius RaitoBezarius merged commit df7e676 into NixOS:master Apr 19, 2023
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants