Skip to content

Commit e9ad4f6

Browse files
authored
Merge pull request #43689 from JuliaLang/vc/llvmpasses
Fix llvmpasses test
2 parents 4f1ff0b + 12cf20c commit e9ad4f6

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

.buildkite/pipelines/main/misc/llvmpasses.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ steps:
2626
timeout_in_minutes: 60
2727
- label: "llvmpasses"
2828
key: "llvmpasses"
29-
soft_fail: true # TODO: delete this line
3029
plugins:
3130
- JuliaCI/julia#v1:
3231
# Drop default "registries" directory, so it is not persisted from execution to execution

cli/loader_lib.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,8 @@ __attribute__((constructor)) void jl_load_libjulia_internal(void) {
239239
}
240240
void *fptr = lookup_symbol(RTLD_DEFAULT, "jl_get_pgcstack_static");
241241
void *(*key)(void) = lookup_symbol(RTLD_DEFAULT, "jl_pgcstack_addr_static");
242-
if (fptr == NULL || key == NULL) {
243-
jl_loader_print_stderr("ERROR: Cannot find jl_get_pgcstack_static(), must define this symbol within calling executable!\n");
244-
exit(1);
245-
}
246-
jl_pgcstack_setkey(fptr, key);
242+
if (fptr != NULL && key != NULL)
243+
jl_pgcstack_setkey(fptr, key);
247244
#endif
248245

249246
// jl_options must be initialized very early, in case an embedder sets some

doc/src/devdocs/llvm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ environment. In addition, it exposes the `-julia` meta-pass, which runs the
7979
entire Julia pass-pipeline over the IR. As an example, to generate a system
8080
image, one could do:
8181
```
82-
opt -enable-new-pm=0 -load libjulia-internal.so -julia -o opt.bc unopt.bc
82+
opt -enable-new-pm=0 -load libjulia-codegen.so -julia -o opt.bc unopt.bc
8383
llc -o sys.o opt.bc
8484
cc -shared -o sys.so sys.o
8585
```

test/llvmpasses/cpu-features.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -load libjulia-internal%shlibext -CPUFeatures -simplifycfg -S %s | FileCheck %s
1+
; RUN: opt -enable-new-pm=0 -load libjulia-codegen%shlibext -CPUFeatures -simplifycfg -S %s | FileCheck %s
22

33
declare i1 @julia.cpu.have_fma.f64()
44
declare double @with_fma(double %0, double %1, double %2)

test/llvmpasses/loopinfo.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ end
104104
end
105105

106106
# FINAL-LABEL: @julia_notunroll
107-
function notunroll(J, I)
107+
@eval function notunroll(J, I)
108108
for i in 1:10
109109
for j in J
110110
1 <= j <= I && continue
@@ -113,6 +113,7 @@ function notunroll(J, I)
113113
# FINAL: call void @j_iteration
114114
# FINAL-NOT: call void @j_iteration
115115
end
116+
$(Expr(:loopinfo, (Symbol("llvm.loop.unroll.disable"),)))
116117
end
117118
end
118119

0 commit comments

Comments
 (0)