diff --git a/cranelift/codegen/meta/src/cdsl/ast.rs b/cranelift/codegen/meta/src/cdsl/ast.rs index ccb9adec01..f4ebea076e 100644 --- a/cranelift/codegen/meta/src/cdsl/ast.rs +++ b/cranelift/codegen/meta/src/cdsl/ast.rs @@ -1,5 +1,5 @@ use crate::cdsl::formats::FormatRegistry; -use crate::cdsl::inst::{InstSpec, Instruction, InstructionPredicate}; +use crate::cdsl::instructions::{InstSpec, Instruction, InstructionPredicate}; use crate::cdsl::operands::{OperandKind, OperandKindFields}; use crate::cdsl::types::ValueType; use crate::cdsl::typevar::{TypeSetBuilder, TypeVar}; diff --git a/cranelift/codegen/meta/src/cdsl/inst.rs b/cranelift/codegen/meta/src/cdsl/instructions.rs similarity index 100% rename from cranelift/codegen/meta/src/cdsl/inst.rs rename to cranelift/codegen/meta/src/cdsl/instructions.rs diff --git a/cranelift/codegen/meta/src/cdsl/isa.rs b/cranelift/codegen/meta/src/cdsl/isa.rs index b8cfa17465..dcac2605c1 100644 --- a/cranelift/codegen/meta/src/cdsl/isa.rs +++ b/cranelift/codegen/meta/src/cdsl/isa.rs @@ -1,5 +1,5 @@ use crate::cdsl::cpu_modes::CpuMode; -use crate::cdsl::inst::InstructionGroup; +use crate::cdsl::instructions::InstructionGroup; use crate::cdsl::regs::IsaRegs; use crate::cdsl::settings::SettingGroup; use crate::cdsl::xform::{TransformGroupIndex, TransformGroups}; diff --git a/cranelift/codegen/meta/src/cdsl/mod.rs b/cranelift/codegen/meta/src/cdsl/mod.rs index 2d7f545dd2..d3227e2dd8 100644 --- a/cranelift/codegen/meta/src/cdsl/mod.rs +++ b/cranelift/codegen/meta/src/cdsl/mod.rs @@ -7,7 +7,7 @@ pub mod ast; pub mod cpu_modes; pub mod formats; -pub mod inst; +pub mod instructions; pub mod isa; pub mod operands; pub mod regs; diff --git a/cranelift/codegen/meta/src/cdsl/xform.rs b/cranelift/codegen/meta/src/cdsl/xform.rs index c748459441..224616f17a 100644 --- a/cranelift/codegen/meta/src/cdsl/xform.rs +++ b/cranelift/codegen/meta/src/cdsl/xform.rs @@ -1,7 +1,7 @@ use crate::cdsl::ast::{ Apply, DefIndex, DefPool, DummyDef, DummyExpr, Expr, PatternPosition, VarIndex, VarPool, }; -use crate::cdsl::inst::Instruction; +use crate::cdsl::instructions::Instruction; use crate::cdsl::type_inference::{infer_transform, TypeEnvironment}; use crate::cdsl::typevar::TypeVar; @@ -404,7 +404,7 @@ impl TransformGroups { #[should_panic] fn test_double_custom_legalization() { use crate::cdsl::formats::{FormatRegistry, InstructionFormatBuilder}; - use crate::cdsl::inst::InstructionBuilder; + use crate::cdsl::instructions::InstructionBuilder; let mut format = FormatRegistry::new(); format.insert(InstructionFormatBuilder::new("nullary")); diff --git a/cranelift/codegen/meta/src/gen_inst.rs b/cranelift/codegen/meta/src/gen_inst.rs index a93538ca3f..a6158258fc 100644 --- a/cranelift/codegen/meta/src/gen_inst.rs +++ b/cranelift/codegen/meta/src/gen_inst.rs @@ -1,6 +1,6 @@ use crate::cdsl::camel_case; use crate::cdsl::formats::{FormatRegistry, InstructionFormat}; -use crate::cdsl::inst::{Instruction, InstructionGroup}; +use crate::cdsl::instructions::{Instruction, InstructionGroup}; use crate::cdsl::operands::Operand; use crate::cdsl::typevar::{TypeSet, TypeVar}; use crate::constant_hash; diff --git a/cranelift/codegen/meta/src/isa/arm32/mod.rs b/cranelift/codegen/meta/src/isa/arm32/mod.rs index 15a9190924..454318b8db 100644 --- a/cranelift/codegen/meta/src/isa/arm32/mod.rs +++ b/cranelift/codegen/meta/src/isa/arm32/mod.rs @@ -1,5 +1,5 @@ use crate::cdsl::cpu_modes::CpuMode; -use crate::cdsl::inst::InstructionGroup; +use crate::cdsl::instructions::InstructionGroup; use crate::cdsl::isa::TargetIsa; use crate::cdsl::regs::{IsaRegs, IsaRegsBuilder, RegBankBuilder, RegClassBuilder}; use crate::cdsl::settings::{SettingGroup, SettingGroupBuilder}; diff --git a/cranelift/codegen/meta/src/isa/arm64/mod.rs b/cranelift/codegen/meta/src/isa/arm64/mod.rs index 4aaeb2c336..1aac6b26ff 100644 --- a/cranelift/codegen/meta/src/isa/arm64/mod.rs +++ b/cranelift/codegen/meta/src/isa/arm64/mod.rs @@ -1,5 +1,5 @@ use crate::cdsl::cpu_modes::CpuMode; -use crate::cdsl::inst::InstructionGroup; +use crate::cdsl::instructions::InstructionGroup; use crate::cdsl::isa::TargetIsa; use crate::cdsl::regs::{IsaRegs, IsaRegsBuilder, RegBankBuilder, RegClassBuilder}; use crate::cdsl::settings::{SettingGroup, SettingGroupBuilder}; diff --git a/cranelift/codegen/meta/src/isa/riscv/mod.rs b/cranelift/codegen/meta/src/isa/riscv/mod.rs index a900f07005..db64c458b9 100644 --- a/cranelift/codegen/meta/src/isa/riscv/mod.rs +++ b/cranelift/codegen/meta/src/isa/riscv/mod.rs @@ -1,5 +1,5 @@ use crate::cdsl::cpu_modes::CpuMode; -use crate::cdsl::inst::InstructionGroup; +use crate::cdsl::instructions::InstructionGroup; use crate::cdsl::isa::TargetIsa; use crate::cdsl::regs::{IsaRegs, IsaRegsBuilder, RegBankBuilder, RegClassBuilder}; use crate::cdsl::settings::{PredicateNode, SettingGroup, SettingGroupBuilder}; diff --git a/cranelift/codegen/meta/src/isa/x86/instructions.rs b/cranelift/codegen/meta/src/isa/x86/instructions.rs index 077860cc46..3255fc99c4 100644 --- a/cranelift/codegen/meta/src/isa/x86/instructions.rs +++ b/cranelift/codegen/meta/src/isa/x86/instructions.rs @@ -1,7 +1,7 @@ #![allow(non_snake_case)] use crate::cdsl::formats::FormatRegistry; -use crate::cdsl::inst::{InstructionBuilder as Inst, InstructionGroup}; +use crate::cdsl::instructions::{InstructionBuilder as Inst, InstructionGroup}; use crate::cdsl::operands::{create_operand as operand, create_operand_doc as operand_doc}; use crate::cdsl::types::ValueType; use crate::cdsl::typevar::{Interval, TypeSetBuilder, TypeVar}; diff --git a/cranelift/codegen/meta/src/isa/x86/legalize.rs b/cranelift/codegen/meta/src/isa/x86/legalize.rs index b214c26914..df6ea99885 100644 --- a/cranelift/codegen/meta/src/isa/x86/legalize.rs +++ b/cranelift/codegen/meta/src/isa/x86/legalize.rs @@ -1,5 +1,5 @@ use crate::cdsl::ast::{var, ExprBuilder, Literal}; -use crate::cdsl::inst::InstructionGroup; +use crate::cdsl::instructions::InstructionGroup; use crate::cdsl::xform::TransformGroupBuilder; use crate::shared::types::Int::{I32, I64}; diff --git a/cranelift/codegen/meta/src/shared/instructions.rs b/cranelift/codegen/meta/src/shared/instructions.rs index 891dadd00a..65f8103672 100644 --- a/cranelift/codegen/meta/src/shared/instructions.rs +++ b/cranelift/codegen/meta/src/shared/instructions.rs @@ -1,7 +1,7 @@ #![allow(non_snake_case)] use crate::cdsl::formats::FormatRegistry; -use crate::cdsl::inst::{InstructionBuilder as Inst, InstructionGroup}; +use crate::cdsl::instructions::{InstructionBuilder as Inst, InstructionGroup}; use crate::cdsl::operands::{create_operand as operand, create_operand_doc as operand_doc}; use crate::cdsl::type_inference::Constraint::WiderOrEq; use crate::cdsl::types::{LaneType, ValueType}; diff --git a/cranelift/codegen/meta/src/shared/legalize.rs b/cranelift/codegen/meta/src/shared/legalize.rs index 66ce180c1c..7d452473a2 100644 --- a/cranelift/codegen/meta/src/shared/legalize.rs +++ b/cranelift/codegen/meta/src/shared/legalize.rs @@ -1,5 +1,5 @@ use crate::cdsl::ast::{var, ExprBuilder, Literal}; -use crate::cdsl::inst::{Instruction, InstructionGroup}; +use crate::cdsl::instructions::{Instruction, InstructionGroup}; use crate::cdsl::xform::{TransformGroupBuilder, TransformGroups}; use crate::shared::OperandKinds; diff --git a/cranelift/codegen/meta/src/shared/mod.rs b/cranelift/codegen/meta/src/shared/mod.rs index 5237d9ba33..f16fb7bb8b 100644 --- a/cranelift/codegen/meta/src/shared/mod.rs +++ b/cranelift/codegen/meta/src/shared/mod.rs @@ -9,7 +9,7 @@ pub mod settings; pub mod types; use crate::cdsl::formats::FormatRegistry; -use crate::cdsl::inst::InstructionGroup; +use crate::cdsl::instructions::InstructionGroup; use crate::cdsl::operands::OperandKind; use crate::cdsl::settings::SettingGroup; use crate::cdsl::xform::TransformGroups;