Skip to content

Commit cfd4b6b

Browse files
authored
Fix Benchmark/Integration CI (rust-lang#503)
1 parent 8562018 commit cfd4b6b

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

enzyme/benchmarks/lit.site.cfg.py.in

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,33 @@ except KeyError:
3939
# directories.
4040
config.excludes = ['Inputs']
4141

42-
config.substitutions.append(('%shlibext', config.llvm_shlib_ext))
43-
config.substitutions.append(('%lli', config.llvm_tools_dir + "/lli"))
44-
config.substitutions.append(('%lli', config.llvm_tools_dir + "/lli"))
4542
config.substitutions.append(('%bench', config.bench_flags))
4643
config.substitutions.append(('%blink', config.bench_link))
4744
config.substitutions.append(('%bldpath', config.bench_ldpath))
45+
config.substitutions.append(('%desired_wd', ''
46+
+ "@ENZYME_SOURCE_DIR@/benchmarks/"))
47+
48+
config.substitutions.append(('%shlibext', config.llvm_shlib_ext))
49+
config.substitutions.append(('%lli', config.llvm_tools_dir + "/lli" + (" --jit-kind=mcjit" if int(config.llvm_ver) >= 13 else "")
50+
))
51+
config.substitutions.append(('%opt', config.llvm_tools_dir + "/opt"))
52+
config.substitutions.append(('%llvmver', config.llvm_ver))
53+
config.substitutions.append(('%FileCheck', config.llvm_tools_dir + "/FileCheck"))
4854
config.substitutions.append(('%clang', config.llvm_tools_dir + "/clang"))
4955
config.substitutions.append(('%loadEnzyme', ''
50-
+ ' -load=@ENZYME_BINARY_DIR@/Enzyme/LLVMEnzyme-' + config.llvm_ver + config.llvm_shlib_ext
51-
+ ' -enzyme-preopt=0' ))
52-
config.substitutions.append(('%desired_wd', ''
53-
+ "@ENZYME_SOURCE_DIR@/benchmarks/"
54-
))
56+
+ (" --enable-new-pm=0" if int(config.llvm_ver) >= 13 else "")
57+
+ ' -load=@ENZYME_BINARY_DIR@/Enzyme/LLVMEnzyme-' + config.llvm_ver + config.llvm_shlib_ext
58+
+ (" --enzyme-attributor=0" if int(config.llvm_ver) >= 13 else "")
59+
+ ' -enzyme-preopt=0'
60+
))
61+
config.substitutions.append(('%loadBC', ''
62+
+ ' @ENZYME_BINARY_DIR@/BCLoad/BCPass-' + config.llvm_ver + config.llvm_shlib_ext
63+
))
64+
config.substitutions.append(('%BClibdir', '@ENZYME_SOURCE_DIR@/bclib/'))
65+
config.substitutions.append(('%loadClangEnzyme', ''
66+
+ (" -fno-experimental-new-pass-manager" if int(config.llvm_ver) >= 13 else "")
67+
+ ' -Xclang -load -Xclang @ENZYME_BINARY_DIR@/Enzyme/ClangEnzyme-' + config.llvm_ver + config.llvm_shlib_ext
68+
))
5569

5670
# Let the main config do the real work.
5771
lit_config.load_config(config, "@ENZYME_SOURCE_DIR@/benchmarks/lit.cfg.py")

enzyme/test/lit.site.cfg.py.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ except KeyError:
3737
config.excludes = ['Inputs']
3838

3939
config.substitutions.append(('%shlibext', config.llvm_shlib_ext))
40-
config.substitutions.append(('%lli', config.llvm_tools_dir + "/lli"))
40+
config.substitutions.append(('%lli', config.llvm_tools_dir + "/lli" + (" --jit-kind=mcjit" if int(config.llvm_ver) >= 13 else "")
41+
))
4142
config.substitutions.append(('%opt', config.llvm_tools_dir + "/opt"))
4243
config.substitutions.append(('%llvmver', config.llvm_ver))
4344
config.substitutions.append(('%FileCheck', config.llvm_tools_dir + "/FileCheck"))

0 commit comments

Comments
 (0)