Skip to content

Commit

Permalink
ci: print llvm-config
Browse files Browse the repository at this point in the history
  • Loading branch information
DaniPopes committed Mar 21, 2024
1 parent 5b7029f commit 0c7503b
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 44 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ 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
Expand All @@ -41,8 +41,6 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
- uses: taiki-e/install-action@cargo-hack
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- name: cargo hack
run: cargo hack check --feature-powerset --depth 2

Expand All @@ -56,8 +54,6 @@ jobs:
version: ${{ env.LLVM_VERSION }}
- uses: dtolnay/rust-toolchain@clippy
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- run: cargo clippy --workspace --all-targets --all-features
env:
RUSTFLAGS: -Dwarnings
Expand All @@ -72,8 +68,6 @@ jobs:
version: ${{ env.LLVM_VERSION }}
- uses: dtolnay/rust-toolchain@nightly
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- run: cargo doc --workspace --all-features --no-deps --document-private-items
env:
RUSTDOCFLAGS:
Expand Down
52 changes: 26 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions crates/revm-jit-cranelift/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions crates/revm-jit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ 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"]
5 changes: 5 additions & 0 deletions crates/revm-jit/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 3 additions & 5 deletions crates/revm-jit/src/main.rs
Original file line number Diff line number Diff line change
@@ -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<()> {
Expand All @@ -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/")));

Expand Down

0 comments on commit 0c7503b

Please sign in to comment.