Compare commits
6 Commits
71e6fd65ab
...
a034844b1a
Author | SHA1 | Date |
---|---|---|
David Mak | a034844b1a | |
David Mak | 3209f88adf | |
David Mak | af77898390 | |
David Mak | 8c7cf4f8f3 | |
David Mak | 48eb64403f | |
David Mak | 2c44b58bb8 |
|
@ -9,6 +9,7 @@ use inkwell::{
|
|||
memory_buffer::MemoryBuffer,
|
||||
module::{Linkage, Module},
|
||||
passes::PassBuilderOptions,
|
||||
support::is_multithreaded,
|
||||
targets::*,
|
||||
OptimizationLevel,
|
||||
};
|
||||
|
@ -582,7 +583,8 @@ impl Nac3 {
|
|||
membuffer.lock().push(buffer);
|
||||
})));
|
||||
let size_t = if self.isa == Isa::Host { 64 } else { 32 };
|
||||
let thread_names: Vec<String> = (0..4).map(|_| "main".to_string()).collect();
|
||||
let num_threads = if is_multithreaded() { 4 } else { 1 };
|
||||
let thread_names: Vec<String> = (0..num_threads).map(|_| "main".to_string()).collect();
|
||||
let threads: Vec<_> = thread_names
|
||||
.iter()
|
||||
.map(|s| Box::new(ArtiqCodeGenerator::new(s.to_string(), size_t, self.time_fns)))
|
||||
|
|
|
@ -31,9 +31,8 @@ else
|
|||
nac3standalone=../../target/x86_64-unknown-linux-gnu/release/nac3standalone
|
||||
fi
|
||||
|
||||
rm -f ./*.o ./*.bc demo
|
||||
if [ -z "$use_lli" ]; then
|
||||
rm -f "*.o" demo
|
||||
|
||||
$nac3standalone "${nac3args[@]}"
|
||||
|
||||
clang -c -std=gnu11 -Wall -Wextra -O3 -o demo.o demo.c
|
||||
|
@ -45,15 +44,19 @@ if [ -z "$use_lli" ]; then
|
|||
./demo > "$outfile"
|
||||
fi
|
||||
else
|
||||
rm -f "*.o" "*.bc" demo
|
||||
|
||||
$nac3standalone --emit-llvm "${nac3args[@]}"
|
||||
|
||||
clang -c -std=gnu11 -Wall -Wextra -O3 -emit-llvm -o demo.bc demo.c
|
||||
|
||||
if [ -z "$outfile" ]; then
|
||||
lli --extra-module demo.bc --extra-module irrt.bc main.bc
|
||||
if ls module*.bc >/dev/null 2>&1; then
|
||||
llvm-link -o module.bc module*.bc main.bc
|
||||
else
|
||||
lli --extra-module demo.bc --extra-module irrt.bc main.bc > "$outfile"
|
||||
cp main.bc module.bc
|
||||
fi
|
||||
|
||||
if [ -z "$outfile" ]; then
|
||||
lli --extra-module demo.bc --extra-module irrt.bc module.bc
|
||||
else
|
||||
lli --extra-module demo.bc --extra-module irrt.bc module.bc > "$outfile"
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -2,6 +2,7 @@ use clap::Parser;
|
|||
use inkwell::{
|
||||
memory_buffer::MemoryBuffer,
|
||||
passes::PassBuilderOptions,
|
||||
support::is_multithreaded,
|
||||
targets::*,
|
||||
OptimizationLevel,
|
||||
};
|
||||
|
@ -38,8 +39,9 @@ struct CommandLineArgs {
|
|||
/// The name of the input file.
|
||||
file_name: String,
|
||||
|
||||
/// The number of threads allocated to processing the source file.
|
||||
#[arg(default_value_t = 1)]
|
||||
/// The number of threads allocated to processing the source file. If 0 is passed to this
|
||||
/// parameter, all available threads will be used for compilation.
|
||||
#[arg(short = 'T', default_value_t = 1)]
|
||||
threads: u32,
|
||||
|
||||
/// The level to optimize the LLVM IR.
|
||||
|
@ -47,6 +49,8 @@ struct CommandLineArgs {
|
|||
opt_level: u32,
|
||||
|
||||
/// Whether to emit LLVM IR at the end of every module.
|
||||
///
|
||||
/// If multithreaded compilation is also enabled, each thread will emit its own module.
|
||||
#[arg(long, default_value_t = false)]
|
||||
emit_llvm: bool,
|
||||
|
||||
|
@ -207,6 +211,20 @@ fn main() {
|
|||
.map(|arg| if arg == "native" { host_target_machine.cpu.clone() } else { arg })
|
||||
.unwrap_or_default();
|
||||
let target_features = target_features.unwrap_or_default();
|
||||
let threads = if is_multithreaded() {
|
||||
if threads == 0 {
|
||||
std::thread::available_parallelism()
|
||||
.map(|threads| threads.get() as u32)
|
||||
.unwrap_or(1u32)
|
||||
} else {
|
||||
threads
|
||||
}
|
||||
} else {
|
||||
if threads != 1 {
|
||||
println!("Warning: Number of threads specified in command-line but multithreading is disabled in LLVM at build time! Defaulting to single-threaded compilation")
|
||||
}
|
||||
1
|
||||
};
|
||||
let opt_level = match opt_level {
|
||||
0 => OptimizationLevel::None,
|
||||
1 => OptimizationLevel::Less,
|
||||
|
|
|
@ -112,7 +112,7 @@ in stdenv.mkDerivation (rec {
|
|||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
|
||||
"-DLLVM_ENABLE_UNWIND_TABLES=OFF"
|
||||
"-DLLVM_ENABLE_THREADS=OFF"
|
||||
"-DLLVM_ENABLE_THREADS=ON"
|
||||
"-DLLVM_INCLUDE_BENCHMARKS=OFF"
|
||||
"-DLLVM_BUILD_TOOLS=OFF"
|
||||
"-DLLVM_TARGETS_TO_BUILD=X86;ARM;RISCV"
|
||||
|
|
|
@ -65,7 +65,7 @@ in rec {
|
|||
${silenceFontconfig}
|
||||
mkdir build
|
||||
cd build
|
||||
wine64 cmake .. -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_UNWIND_TABLES=OFF -DLLVM_ENABLE_THREADS=OFF -DLLVM_TARGETS_TO_BUILD=X86\;ARM\;RISCV -DLLVM_LINK_LLVM_DYLIB=OFF -DLLVM_ENABLE_FFI=OFF -DFFI_INCLUDE_DIR=fck-cmake -DFFI_LIBRARY_DIR=fck-cmake -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_INSTALL_PREFIX=Z:$out
|
||||
wine64 cmake .. -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_UNWIND_TABLES=OFF -DLLVM_ENABLE_THREADS=ON -DLLVM_TARGETS_TO_BUILD=X86\;ARM\;RISCV -DLLVM_LINK_LLVM_DYLIB=OFF -DLLVM_ENABLE_FFI=OFF -DFFI_INCLUDE_DIR=fck-cmake -DFFI_LIBRARY_DIR=fck-cmake -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_INSTALL_PREFIX=Z:$out
|
||||
'';
|
||||
buildPhase =
|
||||
''
|
||||
|
|
Loading…
Reference in New Issue