llvmPackages_git.openmp: apply #197674 (fix cross compile)#222903
Merged
RaitoBezarius merged 1 commit intoNixOS:masterfrom Apr 19, 2023
Merged
llvmPackages_git.openmp: apply #197674 (fix cross compile)#222903RaitoBezarius merged 1 commit intoNixOS:masterfrom
RaitoBezarius merged 1 commit intoNixOS:masterfrom
Conversation
RaitoBezarius
approved these changes
Mar 24, 2023
ofborg
bot
added
the
6.topic: cross-compilation
rrbutani
force-pushed
the
fix/llvm-git-openmp-cross
branch
from
4b928c1 to
3ff445d
Compare
ofborg
bot
added
10.rebuild-darwin: 0
48 tasks
49 tasks
rrbutani
force-pushed
the
fix/llvm-git-openmp-cross
branch
from
3ff445d to
bba47c0
Compare
github-actions
bot
added
6.topic: nixos
this was backported to `llvmPackages_15` in 81ef82a
rrbutani
force-pushed
the
fix/llvm-git-openmp-cross
branch
from
bba47c0 to
61b348f
Compare
github-actions
bot
removed
6.topic: python
Member
|
I'm not sure what to test here, I will try: @ofborg build pkgsCross.aarch64-multiplatform.llvmPackages_git.openmp |
Contributor
Author
|
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 reproduceSometimes there will be extra lines in gtest produced JSON files; for example, {
"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: }
}
]
} |
rrbutani
added
the
6.topic: llvm/clang
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This was applied to
llvmPackages_15in 81ef82a.I ended up needing this in #213202 to apply the
libclcchanges there tollvmPackages_git(likeopenmp,libclcwantstargetLlvm).Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)