peepmatic: Be generic over the operator type
This lets us avoid the cost of `cranelift_codegen::ir::Opcode` to `peepmatic_runtime::Operator` conversion overhead, and paves the way for allowing Peepmatic to support non-clif optimizations (e.g. vcode optimizations). Rather than defining our own `peepmatic::Operator` type like we used to, now the whole `peepmatic` crate is effectively generic over a `TOperator` type parameter. For the Cranelift integration, we use `cranelift_codegen::ir::Opcode` as the concrete type for our `TOperator` type parameter. For testing, we also define a `TestOperator` type, so that we can test Peepmatic code without building all of Cranelift, and we can keep them somewhat isolated from each other. The methods that `peepmatic::Operator` had are now translated into trait bounds on the `TOperator` type. These traits need to be shared between all of `peepmatic`, `peepmatic-runtime`, and `cranelift-codegen`'s Peepmatic integration. Therefore, these new traits live in a new crate: `peepmatic-traits`. This crate acts as a header file of sorts for shared trait/type/macro definitions. Additionally, the `peepmatic-runtime` crate no longer depends on the `peepmatic-macro` procedural macro crate, which should lead to faster build times for Cranelift when it is using pre-built peephole optimizers.
This commit is contained in:
@@ -7,7 +7,9 @@
|
||||
//! directory.
|
||||
|
||||
use alloc::vec::Vec;
|
||||
use core::convert::{TryFrom, TryInto};
|
||||
use core::fmt::{self, Display, Formatter};
|
||||
use core::num::NonZeroU32;
|
||||
use core::ops::{Deref, DerefMut};
|
||||
use core::str::FromStr;
|
||||
|
||||
@@ -69,6 +71,24 @@ impl Opcode {
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<NonZeroU32> for Opcode {
|
||||
type Error = ();
|
||||
|
||||
#[inline]
|
||||
fn try_from(x: NonZeroU32) -> Result<Self, ()> {
|
||||
let x: u16 = x.get().try_into().map_err(|_| ())?;
|
||||
Self::try_from(x)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Opcode> for NonZeroU32 {
|
||||
#[inline]
|
||||
fn from(op: Opcode) -> NonZeroU32 {
|
||||
let x = op as u8;
|
||||
NonZeroU32::new(x as u32).unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
// This trait really belongs in cranelift-reader where it is used by the `.clif` file parser, but since
|
||||
// it critically depends on the `opcode_name()` function which is needed here anyway, it lives in
|
||||
// this module. This also saves us from running the build script twice to generate code for the two
|
||||
|
||||
Reference in New Issue
Block a user