Cargo.lock

@@ -673,7 +673,6 @@ dependencies = [
  "inkwell",
  "insta",
  "itertools 0.11.0",
- "lazy_static",
  "nac3parser",
  "parking_lot",
  "rayon",

nac3artiq/src/lib.rs

@@ -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)))

nac3core/Cargo.toml

@@ -10,7 +10,6 @@ crossbeam = "0.8"
 parking_lot = "0.12"
 rayon = "1.5"
 nac3parser = { path = "../nac3parser" }
-lazy_static = "1.4"
 
 [dependencies.inkwell]
 version = "0.2"

nac3standalone/src/main.rs

@@ -2,6 +2,7 @@ use clap::Parser;
 use inkwell::{
     memory_buffer::MemoryBuffer,
     passes::PassBuilderOptions,
+    support::is_multithreaded,
     targets::*,
     OptimizationLevel,
 };
@@ -210,12 +211,19 @@ 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 threads == 0 {
-        std::thread::available_parallelism()
-            .map(|threads| threads.get() as u32)
-            .unwrap_or(1u32)
+    let threads = if is_multithreaded() {
+        if threads == 0 {
+            std::thread::available_parallelism()
+                .map(|threads| threads.get() as u32)
+                .unwrap_or(1u32)
+        } else {
+            threads
+        }
     } else {
-        threads
+        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,

nix/llvm/default.nix

@@ -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"

nix/windows/default.nix

@@ -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 =
       ''