refactor: move i32-related extractors to prelude.isle

Author: abrown

cranelift/codegen/src/isa/x64/inst.isle

@@ -1781,18 +1781,12 @@
 (extern extractor is_imm8_xmm is_imm8_xmm)
 (decl is_simm8 (i8) GprMemImm)
 (extern extractor is_simm8 is_simm8)
-(decl is_rust_simm8 (i8) i32)
-(extern extractor is_rust_simm8 is_rust_simm8)
 (decl is_imm16 (u16) GprMemImm)
 (extern extractor is_imm16 is_imm16)
-(decl is_rust_imm16 (u16) i32)
-(extern extractor is_rust_imm16 is_rust_imm16)
 (decl is_simm16 (i16) GprMemImm)
 (extern extractor is_simm16 is_simm16)
 (decl is_imm32 (u32) GprMemImm)
 (extern extractor is_imm32 is_imm32)
-(decl is_rust_imm32 (u32) i32)
-(extern extractor is_rust_imm32 is_rust_imm32)
 (decl is_simm32 (i32) GprMemImm)
 (extern extractor is_simm32 is_simm32)
 (decl is_gpr (Gpr) GprMemImm)
@@ -2907,12 +2901,12 @@
 ;; Helper for creating `imul` instructions with an immediate operand. Match
 ;; 8-bit immediates first to allow a smaller instruction encoding.
 (decl x64_imul_imm (Type GprMem i32) Gpr)
-(rule 2 (x64_imul_imm $I16 src1 (is_rust_simm8 src2)) (x64_imulw_rmi_sxb src1 src2))
-(rule 2 (x64_imul_imm $I32 src1 (is_rust_simm8 src2)) (x64_imull_rmi_sxb src1 src2))
-(rule 2 (x64_imul_imm $I64 src1 (is_rust_simm8 src2)) (x64_imulq_rmi_sxb src1 src2))
-(rule 1 (x64_imul_imm $I16 src1 (is_rust_imm16 src2)) (x64_imulw_rmi src1 src2))
-(rule 1 (x64_imul_imm $I32 src1 (is_rust_imm32 src2)) (x64_imull_rmi src1 src2))
-(rule 1 (x64_imul_imm $I64 src1 src2)                 (x64_imulq_rmi_sxl src1 src2))
+(rule 2 (x64_imul_imm $I16 src1 (i8_try_from_i32 src2))  (x64_imulw_rmi_sxb src1 src2))
+(rule 2 (x64_imul_imm $I32 src1 (i8_try_from_i32 src2))  (x64_imull_rmi_sxb src1 src2))
+(rule 2 (x64_imul_imm $I64 src1 (i8_try_from_i32 src2))  (x64_imulq_rmi_sxb src1 src2))
+(rule 1 (x64_imul_imm $I16 src1 (u16_try_from_i32 src2)) (x64_imulw_rmi src1 src2))
+(rule 1 (x64_imul_imm $I32 src1 (i32_as_u32 src2))       (x64_imull_rmi src1 src2))
+(rule 1 (x64_imul_imm $I64 src1 src2)                    (x64_imulq_rmi_sxl src1 src2))
 
 ;; Helper for creating `mul` instructions or `imul` instructions (depending
 ;; on `signed`) for 8-bit operands.

cranelift/codegen/src/isa/x64/lower/isle.rs

@@ -1045,21 +1045,13 @@ impl Context for IsleContext<'_, '_, MInst, X64Backend> {
         }
     }
 
-    fn is_rust_simm8(&mut self, simm32: i32) -> Option<i8> {
-        Some(i8::try_from(simm32).ok()?)
-    }
-
     fn is_imm16(&mut self, src: &GprMemImm) -> Option<u16> {
         match src.clone().to_reg_mem_imm() {
             RegMemImm::Imm { simm32 } => Some(u16::try_from(simm32).ok()?),
             _ => None,
         }
     }
 
-    fn is_rust_imm16(&mut self, simm32: i32) -> Option<u16> {
-        Some(u16::try_from(simm32).ok()?)
-    }
-
     fn is_simm16(&mut self, src: &GprMemImm) -> Option<i16> {
         match src.clone().to_reg_mem_imm() {
             RegMemImm::Imm { simm32 } => Some(i16::try_from(simm32).ok()?),
@@ -1074,10 +1066,6 @@ impl Context for IsleContext<'_, '_, MInst, X64Backend> {
         }
     }
 
-    fn is_rust_imm32(&mut self, simm32: i32) -> Option<u32> {
-        Some(simm32 as u32)
-    }
-
     fn is_simm32(&mut self, src: &GprMemImm) -> Option<i32> {
         match src.clone().to_reg_mem_imm() {
             RegMemImm::Imm { simm32 } => Some(simm32 as i32),

cranelift/codegen/src/isle_prelude.rs

@@ -58,6 +58,11 @@ macro_rules! isle_common_prelude_methods {
             x as i64
         }
 
+        #[inline]
+        fn i32_as_u32(&mut self, x: i32) -> Option<u32> {
+            Some(x as u32)
+        }
+
         #[inline]
         fn i32_as_i64(&mut self, x: i32) -> i64 {
             x.into()
@@ -933,6 +938,10 @@ macro_rules! isle_common_prelude_methods {
             u64::try_from(val).ok()
         }
 
+        fn u16_try_from_i32(&mut self, val: i32) -> Option<u16> {
+            u16::try_from(val).ok()
+        }
+
         fn u16_try_from_u64(&mut self, val: u64) -> Option<u16> {
             u16::try_from(val).ok()
         }
@@ -941,6 +950,10 @@ macro_rules! isle_common_prelude_methods {
             u32::try_from(val).ok()
         }
 
+        fn i8_try_from_i32(&mut self, val: i32) -> Option<i8> {
+            i8::try_from(val).ok()
+        }
+
         fn i8_try_from_u64(&mut self, val: u64) -> Option<i8> {
             i8::try_from(val).ok()
         }

cranelift/codegen/src/prelude.isle

@@ -124,6 +124,9 @@
 (decl pure partial u8_try_from_i32 (i32) u8)
 (extern constructor u8_try_from_i32 u8_try_from_i32)
 
+(decl u16_try_from_i32 (u16) i32)
+(extern extractor u16_try_from_i32 u16_try_from_i32)
+
 (decl pure partial u16_try_from_u64 (u64) u16)
 (extern constructor u16_try_from_u64 u16_try_from_u64)
 
@@ -133,6 +136,9 @@
 (decl pure partial u64_try_from_i64 (i64) u64)
 (extern constructor u64_try_from_i64 u64_try_from_i64)
 
+(decl i8_try_from_i32 (i8) i32)
+(extern extractor i8_try_from_i32 i8_try_from_i32)
+
 (decl pure partial i8_try_from_u64 (u64) i8)
 (extern constructor i8_try_from_u64 i8_try_from_u64)
 
@@ -146,6 +152,9 @@
 (extern constructor u32_as_u64 u32_as_u64)
 (convert u32 u64 u32_as_u64)
 
+(decl i32_as_u32 (u32) i32)
+(extern extractor i32_as_u32 i32_as_u32)
+
 (decl pure i32_as_i64 (i32) i64)
 (extern constructor i32_as_i64 i32_as_i64)
 (convert i32 i64 i32_as_i64)