Merge pull request #1 from DaniPopes/fighting-ci

ci: print llvm-config

.github/workflows/ci.yml

@@ -23,12 +23,14 @@ jobs:
       - uses: KyleMayes/install-llvm-action@v1
         with:
           version: ${{ env.LLVM_VERSION }}
+      - name: llvm-config
+        run: llvm-config --version --bindir --libdir
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
       - name: test
-        run: cargo test --workspace
+        run: cargo test --all-features --workspace --verbose
 
   feature-checks:
     runs-on: ubuntu-latest

crates/revm-jit-cranelift/Cargo.toml

@@ -21,9 +21,9 @@ revm-jit-core.workspace = true
 
 revm-primitives.workspace = true
 
-cranelift = "0.105"
-cranelift-jit = "0.105"
-cranelift-module = "0.105"
-cranelift-native = "0.105"
+cranelift = "0.106"
+cranelift-jit = "0.106"
+cranelift-module = "0.106"
+cranelift-native = "0.106"
 
 color-eyre.workspace = true

crates/revm-jit/Cargo.toml

@@ -30,3 +30,9 @@ color-eyre.workspace = true
 default = ["llvm"]
 llvm = ["dep:revm-jit-llvm"]
 cranelift = ["dep:revm-jit-cranelift"]
+
+[[bin]]
+name = "revm-jit"
+path = "src/main.rs"
+required-features = ["llvm"]
+doc = false

crates/revm-jit/src/bytecode.rs

@@ -77,7 +77,7 @@ impl<'a> Iterator for RawBytecodeIter<'a> {
 
 impl std::iter::FusedIterator for RawBytecodeIter<'_> {}
 
-/// An opcode and its immediate data. Returned by [`RawBytecodeIterator`].
+/// An opcode and its immediate data. Returned by [`RawBytecodeIter`].
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct RawOpcode<'a> {
     /// The opcode.

crates/revm-jit/src/lib.rs

@@ -21,6 +21,11 @@ pub use cranelift::JitEvmCraneliftBackend;
 #[doc(inline)]
 pub use revm_jit_cranelift as cranelift;
 
+#[doc(no_inline)]
+pub use revm_interpreter as interpreter;
+#[doc(no_inline)]
+pub use revm_primitives as primitives;
+
 mod compiler;
 pub use compiler::JitEvm;
 

crates/revm-jit/src/main.rs

@@ -1,9 +1,7 @@
 #![allow(missing_docs)]
 
 use revm_interpreter::opcode as op;
-use revm_jit::JitEvm;
-use revm_jit_core::{ContextStack, Ret};
-use revm_jit_llvm::JitEvmLlvmBackend;
+use revm_jit::{ContextStack, JitEvm, Ret};
 use std::path::PathBuf;
 
 fn main() -> color_eyre::Result<()> {
@@ -13,8 +11,8 @@ fn main() -> color_eyre::Result<()> {
     let _ = color_eyre::install();
 
     // Build the compiler.
-    let context = revm_jit_llvm::inkwell::context::Context::create();
-    let backend = JitEvmLlvmBackend::new(&context).unwrap();
+    let context = revm_jit::llvm::inkwell::context::Context::create();
+    let backend = revm_jit::llvm::JitEvmLlvmBackend::new(&context).unwrap();
     let mut jit = JitEvm::new(backend);
     jit.dump_to(Some(PathBuf::from("./target/")));