Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .buildkite/pipelines/main/misc/llvmpasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ steps:
timeout_in_minutes: 60
- label: "llvmpasses"
key: "llvmpasses"
soft_fail: true # TODO: delete this line
plugins:
- JuliaCI/julia#v1:
# Drop default "registries" directory, so it is not persisted from execution to execution
Expand Down
7 changes: 2 additions & 5 deletions cli/loader_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,8 @@ __attribute__((constructor)) void jl_load_libjulia_internal(void) {
}
void *fptr = lookup_symbol(RTLD_DEFAULT, "jl_get_pgcstack_static");
void *(*key)(void) = lookup_symbol(RTLD_DEFAULT, "jl_pgcstack_addr_static");
if (fptr == NULL || key == NULL) {
jl_loader_print_stderr("ERROR: Cannot find jl_get_pgcstack_static(), must define this symbol within calling executable!\n");
exit(1);
}
jl_pgcstack_setkey(fptr, key);
if (fptr != NULL && key != NULL)
jl_pgcstack_setkey(fptr, key);
#endif

// jl_options must be initialized very early, in case an embedder sets some
Expand Down
2 changes: 1 addition & 1 deletion doc/src/devdocs/llvm.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ environment. In addition, it exposes the `-julia` meta-pass, which runs the
entire Julia pass-pipeline over the IR. As an example, to generate a system
image, one could do:
```
opt -enable-new-pm=0 -load libjulia-internal.so -julia -o opt.bc unopt.bc
opt -enable-new-pm=0 -load libjulia-codegen.so -julia -o opt.bc unopt.bc
llc -o sys.o opt.bc
cc -shared -o sys.so sys.o
```
Expand Down
2 changes: 1 addition & 1 deletion test/llvmpasses/cpu-features.ll
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: opt -load libjulia-internal%shlibext -CPUFeatures -simplifycfg -S %s | FileCheck %s
; RUN: opt -enable-new-pm=0 -load libjulia-codegen%shlibext -CPUFeatures -simplifycfg -S %s | FileCheck %s

declare i1 @julia.cpu.have_fma.f64()
declare double @with_fma(double %0, double %1, double %2)
Expand Down
3 changes: 2 additions & 1 deletion test/llvmpasses/loopinfo.jl
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ end
end

# FINAL-LABEL: @julia_notunroll
function notunroll(J, I)
@eval function notunroll(J, I)
for i in 1:10
for j in J
1 <= j <= I && continue
Expand All @@ -113,6 +113,7 @@ function notunroll(J, I)
# FINAL: call void @j_iteration
# FINAL-NOT: call void @j_iteration
end
$(Expr(:loopinfo, (Symbol("llvm.loop.unroll.disable"),)))
end
end

Expand Down