Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Cranelift: remove the `global_value` instruction (#13682)

Nick Fitzgerald67fe68670609
diff --git a/cranelift/codegen/meta/src/shared/instructions.rs b/cranelift/codegen/meta/src/shared/instructions.rs
index ccca27c7d2..4a08164068 100644
--- a/cranelift/codegen/meta/src/shared/instructions.rs
+++ b/cranelift/codegen/meta/src/shared/instructions.rs
@@ -1220,18 +1220,6 @@ pub(crate) fn define(
.operands_out(vec![Operand::new("addr", iAddr)]),
);
- ig.push(
- Inst::new(
- "global_value",
- r#"
- Compute the value of global GV.
- "#,
- &formats.unary_global_value,
- )
- .operands_in(vec![Operand::new("GV", &entities.global_value)])
- .operands_out(vec![Operand::new("a", Mem).with_doc("Value loaded")]),
- );
-
ig.push(
Inst::new(
"symbol_value",
diff --git a/cranelift/codegen/src/context.rs b/cranelift/codegen/src/context.rs
index 1991ffb2be..177563b8d3 100644
--- a/cranelift/codegen/src/context.rs
+++ b/cranelift/codegen/src/context.rs
@@ -302,7 +302,7 @@ impl Context {
self.cfg.clear();
// Run some specific legalizations only.
- simple_legalize(&mut self.func, isa);
+ simple_legalize(&mut self.func);
self.verify_if(isa)
}
diff --git a/cranelift/codegen/src/inline.rs b/cranelift/codegen/src/inline.rs
index e0e856b417..86ede41113 100644
--- a/cranelift/codegen/src/inline.rs
+++ b/cranelift/codegen/src/inline.rs
@@ -399,14 +399,6 @@ fn inline_one(
callee.dfg.display_inst(callee_inst)
);
- assert_ne!(
- callee.dfg.insts[callee_inst].opcode(),
- ir::Opcode::GlobalValue,
- "callee must already be legalized, we shouldn't see any `global_value` \
- instructions when inlining; found {callee_inst:?}: {}",
- callee.dfg.display_inst(callee_inst)
- );
-
// Remap the callee instruction's entities and insert it into the
// caller's DFG.
let mut inst_remapper = InliningInstRemapper {
diff --git a/cranelift/codegen/src/ir/entities.rs b/cranelift/codegen/src/ir/entities.rs
index 2eb0e9b52a..ffff948375 100644
--- a/cranelift/codegen/src/ir/entities.rs
+++ b/cranelift/codegen/src/ir/entities.rs
@@ -170,8 +170,9 @@ impl DynamicType {
/// - For any compilation target, it can be registered with
/// [`FunctionBuilder::create_global_value`](https://docs.rs/cranelift-frontend/*/cranelift_frontend/struct.FunctionBuilder.html#method.create_global_value).
///
-/// `GlobalValue`s can be retrieved with
-/// [`InstBuilder:global_value`](super::InstBuilder::global_value).
+/// `GlobalValue`s can be referenced from a function's body with
+/// [`InstBuilder::symbol_value`](super::InstBuilder::symbol_value) and
+/// [`InstBuilder::tls_value`](super::InstBuilder::tls_value).
///
/// While the order is stable, it is arbitrary.
#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
diff --git a/cranelift/codegen/src/ir/instructions.rs b/cranelift/codegen/src/ir/instructions.rs
index 6b6e0e29c4..d0d28365c8 100644
--- a/cranelift/codegen/src/ir/instructions.rs
+++ b/cranelift/codegen/src/ir/instructions.rs
@@ -1402,11 +1402,11 @@ mod tests {
// Mapping `GlobalValue`s.
assert_eq!(
map(InstructionData::UnaryGlobalValue {
- opcode: Opcode::GlobalValue,
+ opcode: Opcode::SymbolValue,
global_value: GlobalValue::from_u32(4),
}),
InstructionData::UnaryGlobalValue {
- opcode: Opcode::GlobalValue,
+ opcode: Opcode::SymbolValue,
global_value: GlobalValue::from_u32(5),
}
);
diff --git a/cranelift/codegen/src/legalizer/globalvalue.rs b/cranelift/codegen/src/legalizer/globalvalue.rs
deleted file mode 100644
index ea40b328cb..0000000000
--- a/cranelift/codegen/src/legalizer/globalvalue.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-//! Legalization of global values.
-//!
-//! This module exports the `expand_global_value` function which transforms a `global_value`
-//! instruction into code that depends on the kind of global value referenced.
-
-use super::WalkCommand;
-use crate::cursor::{Cursor, FuncCursor};
-use crate::ir;
-use crate::ir::InstBuilder;
-use crate::isa::TargetIsa;
-
-/// Expand a `global_value` instruction according to the definition of the global value.
-pub fn expand_global_value(
- inst: ir::Inst,
- func: &mut ir::Function,
- isa: &dyn TargetIsa,
- global_value: ir::GlobalValue,
-) -> WalkCommand {
- crate::trace!(
- "expanding global value: {:?}: {}",
- inst,
- func.dfg.display_inst(inst)
- );
-
- match func.global_values[global_value] {
- ir::GlobalValueData::VMContext => vmctx_addr(global_value, inst, func),
- ir::GlobalValueData::IAddImm {
- base,
- offset,
- global_type,
- } => iadd_imm_addr(inst, func, base, offset.into(), global_type),
- ir::GlobalValueData::Load {
- base,
- offset,
- global_type,
- flags,
- } => load_addr(
- inst,
- func,
- base,
- offset,
- global_type,
- func.dfg.mem_flags[flags],
- isa,
- ),
- ir::GlobalValueData::Symbol { tls, .. } => symbol(inst, func, global_value, isa, tls),
- ir::GlobalValueData::DynScaleTargetConst { vector_type } => {
- const_vector_scale(inst, func, vector_type, isa)
- }
- }
-}
-
-fn const_vector_scale(
- inst: ir::Inst,
- func: &mut ir::Function,
- ty: ir::Type,
- isa: &dyn TargetIsa,
-) -> WalkCommand {
- assert!(ty.bytes() <= 16);
-
- // Use a minimum of 128-bits for the base type.
- let base_bytes = core::cmp::max(ty.bytes(), 16);
- let scale = (isa.dynamic_vector_bytes(ty) / base_bytes) as i64;
- assert!(scale > 0);
- let pos = FuncCursor::new(func).at_inst(inst);
- pos.func.replace(inst).iconst(isa.pointer_type(), scale);
-
- WalkCommand::Continue
-}
-
-/// Expand a `global_value` instruction for a vmctx global.
-fn vmctx_addr(
- _global_value: ir::GlobalValue,
- inst: ir::Inst,
- func: &mut ir::Function,
-) -> WalkCommand {
- // Get the value representing the `vmctx` argument.
- let vmctx = func
- .special_param(ir::ArgumentPurpose::VMContext)
- .expect("Missing vmctx parameter");
-
- // Replace the `global_value` instruction's value with an alias to the vmctx arg.
- let result = func.dfg.first_result(inst);
- func.dfg.clear_results(inst);
- func.dfg.change_to_alias(result, vmctx);
- func.layout.remove_inst(inst);
-
- // We removed the instruction, so `cursor.next_inst()` will fail if we
- // return `WalkCommand::Continue`; instead "revisit" the current
- // instruction, which will be the next instruction since we removed the
- // current instruction.
- WalkCommand::Revisit
-}
-
-/// Expand a `global_value` instruction for an iadd_imm global.
-fn iadd_imm_addr(
- inst: ir::Inst,
- func: &mut ir::Function,
- base: ir::GlobalValue,
- offset: i64,
- global_type: ir::Type,
-) -> WalkCommand {
- let mut pos = FuncCursor::new(func).at_inst(inst);
-
- // Get the value for the lhs.
- let lhs = pos.ins().global_value(global_type, base);
-
- // Generate the constant and attach a fact to the constant if
- // there is a fact on the base.
- let constant = pos.ins().iconst(global_type, offset);
-
- // Simply replace the `global_value` instruction with an `iadd_imm`, reusing the result value.
- pos.func.replace(inst).iadd(lhs, constant);
-
- // Need to legalize the `global_value` that we emitted.
- WalkCommand::Revisit
-}
-
-/// Expand a `global_value` instruction for a load global.
-fn load_addr(
- inst: ir::Inst,
- func: &mut ir::Function,
- base: ir::GlobalValue,
- offset: ir::immediates::Offset32,
- global_type: ir::Type,
- flags: ir::MemFlagsData,
- isa: &dyn TargetIsa,
-) -> WalkCommand {
- // We need to load a pointer from the `base` global value, so insert a new `global_value`
- // instruction. This depends on the iterative legalization loop. Note that the IR verifier
- // detects any cycles in the `load` globals.
- let ptr_ty = isa.pointer_type();
-
- let mut pos = FuncCursor::new(func).at_inst(inst);
- pos.use_srcloc(inst);
-
- // Get the value for the base.
- let base_addr = pos.ins().global_value(ptr_ty, base);
-
- // Perform the load.
- pos.func
- .replace(inst)
- .load(global_type, flags, base_addr, offset);
-
- // Need to legalize the `global_value` for the base address.
- WalkCommand::Revisit
-}
-
-/// Expand a `global_value` instruction for a symbolic name global.
-fn symbol(
- inst: ir::Inst,
- func: &mut ir::Function,
- gv: ir::GlobalValue,
- isa: &dyn TargetIsa,
- tls: bool,
-) -> WalkCommand {
- let ptr_ty = isa.pointer_type();
-
- if tls {
- func.replace(inst).tls_value(ptr_ty, gv);
- } else {
- func.replace(inst).symbol_value(ptr_ty, gv);
- }
-
- WalkCommand::Continue
-}
diff --git a/cranelift/codegen/src/legalizer/mod.rs b/cranelift/codegen/src/legalizer/mod.rs
index 978b6832f3..ed09a05b74 100644
--- a/cranelift/codegen/src/legalizer/mod.rs
+++ b/cranelift/codegen/src/legalizer/mod.rs
@@ -15,25 +15,12 @@
use crate::cursor::{Cursor, FuncCursor};
use crate::ir::{self, InstBuilder, InstructionData};
-use crate::isa::TargetIsa;
use crate::trace;
use cranelift_entity::EntitySet;
use smallvec::SmallVec;
mod branch_to_trap;
-mod globalvalue;
-
use self::branch_to_trap::BranchToTrap;
-use self::globalvalue::expand_global_value;
-
-/// A command describing how the walk over instructions should proceed.
-enum WalkCommand {
- /// Continue walking to the next instruction, if any.
- Continue,
- /// Revisit the current instruction (presumably because it was legalized
- /// into a new instruction that may also require further legalization).
- Revisit,
-}
/// A simple, naive backwards walk over every instruction in every block in the
/// function's layout.
@@ -41,31 +28,21 @@ enum WalkCommand {
/// This does not guarantee any kind of reverse post-order visitation or
/// anything like that, it is just iterating over blocks in reverse layout
/// order, not any kind of control-flow graph visitation order.
-///
-/// The `f` visitor closure controls how the walk proceeds via its `WalkCommand`
-/// result.
fn backward_walk(
func: &mut ir::Function,
- mut f: impl FnMut(&mut ir::Function, ir::Block, ir::Inst) -> WalkCommand,
+ mut f: impl FnMut(&mut ir::Function, ir::Block, ir::Inst),
) {
let mut pos = FuncCursor::new(func);
while let Some(block) = pos.prev_block() {
- let mut prev_pos;
- while let Some(inst) = {
- prev_pos = pos.position();
- pos.prev_inst()
- } {
- match f(pos.func, block, inst) {
- WalkCommand::Continue => continue,
- WalkCommand::Revisit => pos.set_position(prev_pos),
- }
+ while let Some(inst) = pos.prev_inst() {
+ f(pos.func, block, inst);
}
}
}
/// Perform a simple legalization by expansion of the function, without
/// platform-specific transforms.
-pub fn simple_legalize(func: &mut ir::Function, isa: &dyn TargetIsa) {
+pub fn simple_legalize(func: &mut ir::Function) {
trace!("Pre-legalization function:\n{}", func.display());
let mut branch_to_trap = BranchToTrap::default();
@@ -82,7 +59,6 @@ pub fn simple_legalize(func: &mut ir::Function, isa: &dyn TargetIsa) {
code: _,
} => {
branch_to_trap.analyze_trapping_block(func, block);
- WalkCommand::Continue
}
InstructionData::Brif {
opcode: ir::Opcode::Brif,
@@ -90,15 +66,9 @@ pub fn simple_legalize(func: &mut ir::Function, isa: &dyn TargetIsa) {
blocks,
} => {
branch_to_trap.process_brif(func, inst, arg, blocks);
- WalkCommand::Continue
}
- InstructionData::UnaryGlobalValue {
- opcode: ir::Opcode::GlobalValue,
- global_value,
- } => expand_global_value(inst, func, isa, global_value),
-
- _ => WalkCommand::Continue,
+ _ => {}
});
trace!("Post-legalization function:\n{}", func.display());
diff --git a/cranelift/docs/ir.md b/cranelift/docs/ir.md
index ec28fdb111..d5e56355f2 100644
--- a/cranelift/docs/ir.md
+++ b/cranelift/docs/ir.md
@@ -492,11 +492,10 @@ stack overflow checks in the prologue.
### Global values
A *global value* is an object whose value is not known at compile time. The
-value is computed at runtime by `global_value`, possibly using
-information provided by the linker via relocations. There are multiple
-kinds of global values using different methods for determining their value.
-Cranelift does not track the type of a global value, for they are just
-values stored in non-stack memory.
+value is computed at runtime, possibly using information provided by the linker
+via relocations. There are multiple kinds of global values using different
+methods for determining their value. Cranelift does not track the type of a
+global value, for they are just values stored in non-stack memory.
When Cranelift is generating code for a virtual machine environment, globals can
be used to access data structures in the VM's runtime. This requires functions
diff --git a/cranelift/filetests/filetests/alias/extends.clif b/cranelift/filetests/filetests/alias/extends.clif
index 9c04047e18..601d7392b3 100644
--- a/cranelift/filetests/filetests/alias/extends.clif
+++ b/cranelift/filetests/filetests/alias/extends.clif
@@ -10,7 +10,7 @@ function %f0(i64 vmctx, i32) -> i32, i32, i32, i64, i64, i64 {
gv1 = load.i64 notrap readonly aligned gv0+8
block0(v0: i64, v1: i32):
- v2 = global_value.i64 gv1
+ v2 = load.i64 notrap readonly aligned v0+8
;; Initial load. This will not be reused by anything below, even
;; though it does access the same address.
diff --git a/cranelift/filetests/filetests/alias/fence.clif b/cranelift/filetests/filetests/alias/fence.clif
index be19db1eff..847c7c7d7f 100644
--- a/cranelift/filetests/filetests/alias/fence.clif
+++ b/cranelift/filetests/filetests/alias/fence.clif
@@ -12,7 +12,7 @@ function %f0(i64 vmctx, i32) -> i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
region0 = 0 "vmctx"
block0(v0: i64, v1: i32):
- v2 = global_value.i64 gv1
+ v2 = load.i64 notrap readonly aligned v0+8
v3 = load.i32 v2+8
v4 = load.i32 region0 v0+16
diff --git a/cranelift/filetests/filetests/alias/multiple-blocks.clif b/cranelift/filetests/filetests/alias/multiple-blocks.clif
index 1c4330bd4a..0cdbd497e9 100644
--- a/cranelift/filetests/filetests/alias/multiple-blocks.clif
+++ b/cranelift/filetests/filetests/alias/multiple-blocks.clif
@@ -9,7 +9,7 @@ function %f0(i64 vmctx, i32) -> i32 {
gv1 = load.i64 notrap readonly aligned gv0+8
block0(v0: i64, v1: i32):
- v2 = global_value.i64 gv1
+ v2 = load.i64 notrap readonly aligned v0+8
v3 = load.i32 v2+8
brif v2, block2, block1
diff --git a/cranelift/filetests/filetests/alias/partial-redundancy.clif b/cranelift/filetests/filetests/alias/partial-redundancy.clif
index aac64827f7..d5ae79a2a7 100644
--- a/cranelift/filetests/filetests/alias/partial-redundancy.clif
+++ b/cranelift/filetests/filetests/alias/partial-redundancy.clif
@@ -14,17 +14,17 @@ block0(v0: i64, v1: i32):
brif v1, block2, block1
block1:
- v2 = global_value.i64 gv1
+ v2 = load.i64 notrap readonly aligned v0+8
v3 = load.i32 v2+64
jump block3(v3)
block2:
- v4 = global_value.i64 gv1
+ v4 = load.i64 notrap readonly aligned v0+8
v5 = load.i32 v4+128
jump block3(v5)
block3(v6: i32):
- v7 = global_value.i64 gv1
+ v7 = load.i64 notrap readonly aligned v0+8
v8 = load.i32 v7+64
;; load should survive:
; check: v8 = load.i32 v7+64
diff --git a/cranelift/filetests/filetests/alias/simple-alias.clif b/cranelift/filetests/filetests/alias/simple-alias.clif
index 2994373265..7025c5d78f 100644
--- a/cranelift/filetests/filetests/alias/simple-alias.clif
+++ b/cranelift/filetests/filetests/alias/simple-alias.clif
@@ -12,7 +12,7 @@ function %f0(i64 vmctx, i32) -> i32, i32, i32, i32 {
fn0 = %g(i64 vmctx)
block0(v0: i64, v1: i32):
- v2 = global_value.i64 gv1
+ v2 = load.i64 notrap readonly aligned v0+8
v3 = load.i32 v2+8
;; This should reuse the load above.
v5 = load.i32 v2+8
@@ -39,7 +39,7 @@ function %f1(i64 vmctx, i32) -> i32 {
fn0 = %g(i64 vmctx)
block0(v0: i64, v1: i32):
- v2 = global_value.i64 gv1
+ v2 = load.i64 notrap readonly aligned v0+8
store.i32 v1, v2+8
;; This load should pick up the store above.
diff --git a/cranelift/filetests/filetests/inline/globals.clif b/cranelift/filetests/filetests/inline/globals.clif
index 2ccfd479b2..7895eeab12 100644
--- a/cranelift/filetests/filetests/inline/globals.clif
+++ b/cranelift/filetests/filetests/inline/globals.clif
@@ -6,7 +6,8 @@ function %f0() -> i64 {
gv1 = load.i64 notrap aligned gv0+8
block0:
v0 = symbol_value.i64 gv0
- v1 = global_value.i64 gv1
+ v3 = symbol_value.i64 gv0
+ v1 = load.i64 notrap aligned v3+8
v2 = iadd v0, v1
return v2
}
diff --git a/cranelift/filetests/filetests/inline/vmctx.clif b/cranelift/filetests/filetests/inline/vmctx.clif
index 82e5b416b0..7a2f5ec0b6 100644
--- a/cranelift/filetests/filetests/inline/vmctx.clif
+++ b/cranelift/filetests/filetests/inline/vmctx.clif
@@ -5,7 +5,7 @@ function %f0(i64 vmctx) -> i64 {
gv0 = vmctx
gv1 = load.i64 notrap aligned gv0+16
block0(v0: i64):
- v1 = global_value.i64 gv1
+ v1 = load.i64 notrap aligned v0+16
return v1
}
diff --git a/cranelift/filetests/filetests/isa/aarch64/dynamic-slot.clif b/cranelift/filetests/filetests/isa/aarch64/dynamic-slot.clif
index 5c938fe14e..e957cd49fd 100644
--- a/cranelift/filetests/filetests/isa/aarch64/dynamic-slot.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/dynamic-slot.clif
@@ -6,7 +6,7 @@ function %store_scale() {
ss0 = explicit_slot 8
block0:
- v0 = global_value.i64 gv0
+ v0 = iconst.i64 1
v1 = stack_addr.i64 ss0
store.i64 notrap v0, v1
return
@@ -40,7 +40,7 @@ function %store_scale_lt_128() {
ss0 = explicit_slot 8
block0:
- v0 = global_value.i64 gv0
+ v0 = iconst.i64 1
v1 = stack_addr.i64 ss0
store.i64 notrap v0, v1
return
diff --git a/cranelift/filetests/filetests/isa/aarch64/tls-elf-gd.clif b/cranelift/filetests/filetests/isa/aarch64/tls-elf-gd.clif
index 7f185e4b2e..5e8dafde24 100644
--- a/cranelift/filetests/filetests/isa/aarch64/tls-elf-gd.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/tls-elf-gd.clif
@@ -6,7 +6,7 @@ function u0:0(i32) -> i32, i64 {
gv0 = symbol colocated tls u1:0
block0(v0: i32):
- v1 = global_value.i64 gv0
+ v1 = tls_value.i64 gv0
return v0, v1
}
diff --git a/cranelift/filetests/filetests/isa/aarch64/tls-macho.clif b/cranelift/filetests/filetests/isa/aarch64/tls-macho.clif
index 627eca8906..89ed637aa5 100644
--- a/cranelift/filetests/filetests/isa/aarch64/tls-macho.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/tls-macho.clif
@@ -6,7 +6,7 @@ function u0:0(i32) -> i32, i64 {
gv0 = symbol colocated tls u1:0
block0(v0: i32):
- v1 = global_value.i64 gv0
+ v1 = tls_value.i64 gv0
return v0, v1
}
diff --git a/cranelift/filetests/filetests/isa/riscv64/tls-elf.clif b/cranelift/filetests/filetests/isa/riscv64/tls-elf.clif
index c75afecfc5..b33b79c160 100644
--- a/cranelift/filetests/filetests/isa/riscv64/tls-elf.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/tls-elf.clif
@@ -6,7 +6,7 @@ function u0:0(i32) -> i32, i64 {
gv0 = symbol colocated tls u1:0
block0(v0: i32):
- v1 = global_value.i64 gv0
+ v1 = tls_value.i64 gv0
return v0, v1
}
diff --git a/cranelift/filetests/filetests/isa/s390x/tls_elf.clif b/cranelift/filetests/filetests/isa/s390x/tls_elf.clif
index a685783fbd..d2ca8e9386 100644
--- a/cranelift/filetests/filetests/isa/s390x/tls_elf.clif
+++ b/cranelift/filetests/filetests/isa/s390x/tls_elf.clif
@@ -6,7 +6,7 @@ function u0:0(i32) -> i64 {
gv0 = symbol colocated tls u1:0
block0(v0: i32):
- v1 = global_value.i64 gv0
+ v1 = tls_value.i64 gv0
return v1
}
diff --git a/cranelift/filetests/filetests/isa/x64/atomic-cas-bug.clif b/cranelift/filetests/filetests/isa/x64/atomic-cas-bug.clif
index e7c931bebe..38b8815437 100644
--- a/cranelift/filetests/filetests/isa/x64/atomic-cas-bug.clif
+++ b/cranelift/filetests/filetests/isa/x64/atomic-cas-bug.clif
@@ -158,9 +158,9 @@ function u0:31(i64, i32, i32, i8, i8) -> i32, i32 system_v {
@0005 brif.i64 v26, block3, block23
block8:
-@0007 v29 = global_value.i64 gv0
+@0007 v29 = symbol_value.i64 gv0
@0007 v30 = iconst.i64 1
-@0006 v31 = global_value.i64 gv1
+@0006 v31 = symbol_value.i64 gv1
@0006 v32 = iconst.i64 0
@0006 v33 = stack_addr.i64 ss8
@0006 call fn0(v33, v29, v30, v31, v32)
@@ -239,37 +239,37 @@ function u0:31(i64, i32, i32, i8, i8) -> i32, i32 system_v {
@0036 jump block32(v85, v86)
block27:
-@0038 v88 = global_value.i64 gv2
+@0038 v88 = symbol_value.i64 gv2
@0038 v89 = iconst.i64 1
-@0037 v90 = global_value.i64 gv3
+@0037 v90 = symbol_value.i64 gv3
@0037 v91 = iconst.i64 0
@0037 v92 = stack_addr.i64 ss6
@0037 call fn1(v92, v88, v89, v90, v91)
@0037 jump block28
block28 cold:
-@003b v93 = global_value.i64 gv4
+@003b v93 = symbol_value.i64 gv4
@003b v94 = stack_addr.i64 ss6
@003b call fn2(v94, v93)
@003b trap user1
block29:
-@003d v95 = global_value.i64 gv5
+@003d v95 = symbol_value.i64 gv5
@003d v96 = iconst.i64 1
-@003c v97 = global_value.i64 gv6
+@003c v97 = symbol_value.i64 gv6
@003c v98 = iconst.i64 0
@003c v99 = stack_addr.i64 ss7
@003c call fn3(v99, v95, v96, v97, v98)
@003c jump block30
block30 cold:
-@0040 v100 = global_value.i64 gv7
+@0040 v100 = symbol_value.i64 gv7
@0040 v101 = stack_addr.i64 ss7
@0040 call fn4(v101, v100)
@0040 trap user1
block31 cold:
-@0041 v102 = global_value.i64 gv8
+@0041 v102 = symbol_value.i64 gv8
@0041 v103 = stack_addr.i64 ss8
@0041 call fn5(v103, v102)
@0041 trap user1
diff --git a/cranelift/filetests/filetests/isa/x64/simd-issue-3951.clif b/cranelift/filetests/filetests/isa/x64/simd-issue-3951.clif
index 1fd8db723f..38e13986bb 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-issue-3951.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-issue-3951.clif
@@ -6,10 +6,8 @@ target x86_64 skylake
function %check_issue_3951(i64 vmctx) -> i8x16 fast {
gv0 = vmctx
block0(v0: i64):
- v2 = global_value.i64 gv0
- v3 = load.i8x16 notrap aligned v2+8
- v4 = global_value.i64 gv0
- v5 = load.i8x16 notrap aligned v4+8
+ v3 = load.i8x16 notrap aligned v0+8
+ v5 = load.i8x16 notrap aligned v0+8
v6 = icmp ugt v3, v5
v7 = bitcast.i8x16 v6
jump block1(v7)
diff --git a/cranelift/filetests/filetests/isa/x64/tls_coff.clif b/cranelift/filetests/filetests/isa/x64/tls_coff.clif
index 2a4a8d6101..8c240211e0 100644
--- a/cranelift/filetests/filetests/isa/x64/tls_coff.clif
+++ b/cranelift/filetests/filetests/isa/x64/tls_coff.clif
@@ -7,7 +7,7 @@ function u0:0(i32) -> i64 {
gv0 = symbol colocated tls u1:0
block0(v0: i32):
- v1 = global_value.i64 gv0
+ v1 = tls_value.i64 gv0
return v1
}
diff --git a/cranelift/filetests/filetests/isa/x64/tls_elf.clif b/cranelift/filetests/filetests/isa/x64/tls_elf.clif
index 651456d822..2256be414c 100644
--- a/cranelift/filetests/filetests/isa/x64/tls_elf.clif
+++ b/cranelift/filetests/filetests/isa/x64/tls_elf.clif
@@ -6,7 +6,7 @@ function u0:0(i32) -> i64 {
gv0 = symbol colocated tls u1:0
block0(v0: i32):
- v1 = global_value.i64 gv0
+ v1 = tls_value.i64 gv0
return v1
}
diff --git a/cranelift/filetests/filetests/isa/x64/tls_macho.clif b/cranelift/filetests/filetests/isa/x64/tls_macho.clif
index 5d36da58ac..7d13b3d259 100644
--- a/cranelift/filetests/filetests/isa/x64/tls_macho.clif
+++ b/cranelift/filetests/filetests/isa/x64/tls_macho.clif
@@ -6,7 +6,7 @@ function u0:0(i32) -> i64 {
gv0 = symbol colocated tls u1:0
block0(v0: i32):
- v1 = global_value.i64 gv0
+ v1 = tls_value.i64 gv0
return v1
}
diff --git a/cranelift/filetests/filetests/parser/memory.clif b/cranelift/filetests/filetests/parser/memory.clif
index 7ef85c07f6..c218b3904c 100644
--- a/cranelift/filetests/filetests/parser/memory.clif
+++ b/cranelift/filetests/filetests/parser/memory.clif
@@ -1,13 +1,11 @@
test cat
test verifier
-function %vmglobal(i64 vmctx) -> i32 {
+function %vmglobal(i64 vmctx) -> i64 {
gv3 = vmctx
; check: gv3 = vmctx
block0(v0: i64):
- v1 = global_value.i32 gv3
- ; check: v1 = global_value.i32 gv3
- return v1
+ return v0
}
function %load_and_add_imm(i64 vmctx) -> i32 {
@@ -18,9 +16,10 @@ function %load_and_add_imm(i64 vmctx) -> i32 {
; check: gv3 = load.i32 notrap aligned gv2-72
; check: gv4 = iadd_imm.i32 gv3, -32
block0(v0: i64):
- v1 = global_value.i32 gv4
- ; check: v1 = global_value.i32 gv4
- return v1
+ v1 = load.i32 notrap aligned v0-72
+ v2 = iconst.i32 -32
+ v3 = iadd v1, v2
+ return v3
}
; Refer to a global value before it's been declared.
@@ -32,7 +31,7 @@ function %backref(i64 vmctx) -> i32 {
gv2 = vmctx
; check: gv2 = vmctx
block0(v0: i64):
- v1 = global_value.i32 gv1
+ v1 = load.i32 notrap aligned v0
return v1
}
@@ -42,10 +41,10 @@ function %symbol() -> i32 {
gv1 = symbol u8:9
; check: gv1 = symbol userextname0
block0:
- v0 = global_value.i32 gv0
- ; check: v0 = global_value.i32 gv0
- v1 = global_value.i32 gv1
- ; check: v1 = global_value.i32 gv1
+ v0 = symbol_value.i32 gv0
+ ; check: v0 = symbol_value.i32 gv0
+ v1 = symbol_value.i32 gv1
+ ; check: v1 = symbol_value.i32 gv1
v2 = bxor v0, v1
return v2
}
diff --git a/cranelift/filetests/filetests/runtests/global_value.clif b/cranelift/filetests/filetests/runtests/global_value.clif
index 59cf952e58..1f6896fd06 100644
--- a/cranelift/filetests/filetests/runtests/global_value.clif
+++ b/cranelift/filetests/filetests/runtests/global_value.clif
@@ -12,8 +12,7 @@ function %simple(i64 vmctx) -> i64 {
gv0 = vmctx
block0(v0: i64):
- v1 = global_value.i64 gv0
- return v1
+ return v0
}
; run: %simple(0) == 0
; run: %simple(10) == 10
@@ -50,7 +49,7 @@ function %load_at_0_and_add(i64 vmctx) -> i64 {
gv1 = load.i64 notrap aligned gv0+0
block0(v0: i64):
- v1 = global_value.i64 gv1
+ v1 = load.i64 notrap aligned v0
v3 = iconst.i64 1
v2 = iadd v1, v3
return v2
diff --git a/cranelift/filetests/filetests/verifier/globals.clif b/cranelift/filetests/filetests/verifier/globals.clif
index 1a44cf8001..1996206b86 100644
--- a/cranelift/filetests/filetests/verifier/globals.clif
+++ b/cranelift/filetests/filetests/verifier/globals.clif
@@ -10,10 +10,10 @@ block0(v0: i64):
return
}
-function %global_value_wrong_type(i64 vmctx) {
- gv0 = vmctx
+function %symbol_value_wrong_type() {
+ gv0 = symbol %sym
-block0(v0: i64):
- v1 = global_value.i32 gv0 ; error: global_value instruction with type i32 references global value with type i64
+block0:
+ v1 = symbol_value.i32 gv0 ; error: global_value instruction with type i32 references global value with type i64
return
}
diff --git a/cranelift/filetests/filetests/verifier/undeclared_vmctx.clif b/cranelift/filetests/filetests/verifier/undeclared_vmctx.clif
index a48e7a0ef6..74ab8d2321 100644
--- a/cranelift/filetests/filetests/verifier/undeclared_vmctx.clif
+++ b/cranelift/filetests/filetests/verifier/undeclared_vmctx.clif
@@ -4,14 +4,12 @@ test verifier
function %vmglobal_err(i64) -> i64 {
gv4 = vmctx ; error: undeclared vmctx reference
block0(v0: i64):
- v1 = global_value.i64 gv4
- return v1
+ return v0
}
; If it is declared, all is fine.
function %vmglobal_ok(i64 vmctx) -> i64 {
gv4 = vmctx
block0(v0: i64):
- v1 = global_value.i64 gv4
- return v1
+ return v0
}
diff --git a/cranelift/fuzzgen/src/function_generator.rs b/cranelift/fuzzgen/src/function_generator.rs
index 1de9371e51..543ad4cc84 100644
--- a/cranelift/fuzzgen/src/function_generator.rs
+++ b/cranelift/fuzzgen/src/function_generator.rs
@@ -839,7 +839,6 @@ static OPCODE_SIGNATURES: LazyLock<Vec<OpcodeSignature>> = LazyLock::new(|| {
(Opcode::Sload32x2),
(Opcode::StackAddr),
(Opcode::DynamicStackAddr),
- (Opcode::GlobalValue),
(Opcode::SymbolValue),
(Opcode::TlsValue),
(Opcode::GetPinnedReg),
diff --git a/cranelift/interpreter/src/step.rs b/cranelift/interpreter/src/step.rs
index 4f3e500cdf..8e4c5bd1de 100644
--- a/cranelift/interpreter/src/step.rs
+++ b/cranelift/interpreter/src/step.rs
@@ -544,7 +544,7 @@ where
})
}
Opcode::DynamicStackAddr => unimplemented!("DynamicStackSlot"),
- Opcode::GlobalValue | Opcode::SymbolValue | Opcode::TlsValue => {
+ Opcode::SymbolValue | Opcode::TlsValue => {
if let InstructionData::UnaryGlobalValue { global_value, .. } = inst {
assign_or_memtrap(state.resolve_global_value(global_value))
} else {
diff --git a/cranelift/object/tests/basic.rs b/cranelift/object/tests/basic.rs
index 969ad3c5e8..7af6b0731e 100644
--- a/cranelift/object/tests/basic.rs
+++ b/cranelift/object/tests/basic.rs
@@ -301,7 +301,7 @@ fn aarch64_colocated_data_symbol_reloc() {
let gv = module.declare_data_in_func(data_id, &mut bcx.func);
let ptr = module.target_config().pointer_type();
- let addr = bcx.ins().global_value(ptr, gv);
+ let addr = bcx.ins().symbol_value(ptr, gv);
bcx.ins().return_(&[addr]);
bcx.seal_all_blocks();
diff --git a/cranelift/tests/bugpoint_test.clif b/cranelift/tests/bugpoint_test.clif
index 4bf9431543..c4387574c2 100644
--- a/cranelift/tests/bugpoint_test.clif
+++ b/cranelift/tests/bugpoint_test.clif
@@ -425,8 +425,8 @@ block1:
brif v121, block2, block3
block2:
- v122 = global_value.i64 gv0
- v123 = global_value.i64 gv1
+ v122 = symbol_value.i64 gv0
+ v123 = symbol_value.i64 gv1
trap user1
block3:
@@ -442,8 +442,8 @@ block3:
brif v133, block4, block5
block4:
- v134 = global_value.i64 gv2
- v135 = global_value.i64 gv3
+ v134 = symbol_value.i64 gv2
+ v135 = symbol_value.i64 gv3
trap user1
block5:
@@ -459,8 +459,8 @@ block5:
brif v145, block6, block7
block6:
- v146 = global_value.i64 gv4
- v147 = global_value.i64 gv5
+ v146 = symbol_value.i64 gv4
+ v147 = symbol_value.i64 gv5
trap user1
block7:
@@ -484,8 +484,8 @@ block9:
brif v157, block10, block11
block10:
- v158 = global_value.i64 gv6
- v159 = global_value.i64 gv7
+ v158 = symbol_value.i64 gv6
+ v159 = symbol_value.i64 gv7
trap user1
block11:
@@ -509,8 +509,8 @@ block13:
brif v169, block14, block15
block14:
- v170 = global_value.i64 gv8
- v171 = global_value.i64 gv9
+ v170 = symbol_value.i64 gv8
+ v171 = symbol_value.i64 gv9
trap user1
block15:
@@ -530,8 +530,8 @@ block16:
brif v182, block17, block18
block17:
- v183 = global_value.i64 gv10
- v184 = global_value.i64 gv11
+ v183 = symbol_value.i64 gv10
+ v184 = symbol_value.i64 gv11
trap user1
block18:
@@ -552,7 +552,7 @@ block18:
brif v197, block164, block19
block164:
- v198 = global_value.i64 gv12
+ v198 = symbol_value.i64 gv12
trap user2
block19:
@@ -573,7 +573,7 @@ block19:
brif v210, block163, block20
block163:
- v211 = global_value.i64 gv13
+ v211 = symbol_value.i64 gv13
trap user2
block20:
@@ -586,8 +586,8 @@ block20:
brif v219, block21, block22
block21:
- v220 = global_value.i64 gv14
- v221 = global_value.i64 gv15
+ v220 = symbol_value.i64 gv14
+ v221 = symbol_value.i64 gv15
trap user1
block22:
@@ -608,7 +608,7 @@ block22:
brif v234, block162, block23
block162:
- v235 = global_value.i64 gv16
+ v235 = symbol_value.i64 gv16
trap user2
block23:
@@ -639,7 +639,7 @@ block24:
brif v253, block161, block25
block161:
- v254 = global_value.i64 gv17
+ v254 = symbol_value.i64 gv17
trap user2
block25:
@@ -685,7 +685,7 @@ block27:
brif v279, block160, block28
block160:
- v280 = global_value.i64 gv18
+ v280 = symbol_value.i64 gv18
trap user2
block28:
@@ -703,7 +703,7 @@ block28:
brif v290, block159, block29
block159:
- v291 = global_value.i64 gv19
+ v291 = symbol_value.i64 gv19
trap user2
block29:
@@ -725,7 +725,7 @@ block29:
brif v303, block158, block30
block158:
- v304 = global_value.i64 gv20
+ v304 = symbol_value.i64 gv20
trap user2
block30:
@@ -743,7 +743,7 @@ block30:
brif v314, block157, block31
block157:
- v315 = global_value.i64 gv21
+ v315 = symbol_value.i64 gv21
trap user2
block31:
@@ -797,7 +797,7 @@ block36:
brif v337, block37, block38
block37:
- v338 = global_value.i64 gv22
+ v338 = symbol_value.i64 gv22
v339 = iconst.i64 3
v1105 = iconst.i64 8
v342 = iadd v36, v1105
@@ -836,9 +836,9 @@ block40:
jump block41
block41:
- v360 = global_value.i64 gv23
+ v360 = symbol_value.i64 gv23
call fn39(v32, v360)
- v361 = global_value.i64 gv24
+ v361 = symbol_value.i64 gv24
trap user1
block42:
@@ -869,7 +869,7 @@ block43:
brif v377, block44, block45
block44:
- v378 = global_value.i64 gv25
+ v378 = symbol_value.i64 gv25
v379 = iconst.i64 3
v1111 = iconst.i64 8
v382 = iadd v46, v1111
@@ -908,9 +908,9 @@ block47:
jump block48
block48:
- v400 = global_value.i64 gv26
+ v400 = symbol_value.i64 gv26
call fn46(v42, v400)
- v401 = global_value.i64 gv27
+ v401 = symbol_value.i64 gv27
trap user1
block49(v1006: i16):
@@ -930,7 +930,7 @@ block49(v1006: i16):
brif v412, block156, block50
block156:
- v413 = global_value.i64 gv28
+ v413 = symbol_value.i64 gv28
trap user2
block50:
@@ -954,7 +954,7 @@ block50:
brif v425, block155, block51
block155:
- v426 = global_value.i64 gv29
+ v426 = symbol_value.i64 gv29
trap user2
block51:
@@ -970,7 +970,7 @@ block51:
brif v433, block154, block52
block154:
- v434 = global_value.i64 gv30
+ v434 = symbol_value.i64 gv30
trap user2
block52:
@@ -992,7 +992,7 @@ block52:
brif v448, block153, block53
block153:
- v449 = global_value.i64 gv31
+ v449 = symbol_value.i64 gv31
trap user2
block53:
@@ -1014,7 +1014,7 @@ block53:
brif v463, block152, block54
block152:
- v464 = global_value.i64 gv32
+ v464 = symbol_value.i64 gv32
trap user2
block54:
@@ -1033,7 +1033,7 @@ block54:
brif v475, block151, block55
block151:
- v476 = global_value.i64 gv33
+ v476 = symbol_value.i64 gv33
trap user2
block55:
@@ -1063,7 +1063,7 @@ block56:
brif v494, block150, block57
block150:
- v495 = global_value.i64 gv34
+ v495 = symbol_value.i64 gv34
trap user2
block57:
@@ -1081,7 +1081,7 @@ block57:
brif v505, block149, block58
block149:
- v506 = global_value.i64 gv35
+ v506 = symbol_value.i64 gv35
trap user2
block58:
@@ -1099,7 +1099,7 @@ block58:
brif v518, block148, block59
block148:
- v519 = global_value.i64 gv36
+ v519 = symbol_value.i64 gv36
trap user2
block59:
@@ -1119,7 +1119,7 @@ block59:
brif v531, block147, block60
block147:
- v532 = global_value.i64 gv37
+ v532 = symbol_value.i64 gv37
trap user2
block60:
@@ -1138,7 +1138,7 @@ block60:
brif v543, block146, block61
block146:
- v544 = global_value.i64 gv38
+ v544 = symbol_value.i64 gv38
trap user2
block61:
@@ -1192,7 +1192,7 @@ block62(v552: i32, v1009: i64, v1013: i64, v1016: i64, v1019: i64, v1022: i16, v
brif v557, block145, block63
block145:
- v558 = global_value.i64 gv39
+ v558 = symbol_value.i64 gv39
trap user2
block63:
@@ -1206,7 +1206,7 @@ block63:
brif v567, block144, block64
block144:
- v568 = global_value.i64 gv40
+ v568 = symbol_value.i64 gv40
trap user2
block64:
@@ -1228,8 +1228,8 @@ block65:
brif v581, block66, block67
block66:
- v582 = global_value.i64 gv41
- v583 = global_value.i64 gv42
+ v582 = symbol_value.i64 gv41
+ v583 = symbol_value.i64 gv42
trap user1
block67:
@@ -1250,7 +1250,7 @@ block68(v584: i32):
brif v594, block143, block69
block143:
- v595 = global_value.i64 gv43
+ v595 = symbol_value.i64 gv43
trap user2
block69:
@@ -1261,7 +1261,7 @@ block69:
brif v601, block70, block142
block142:
- v602 = global_value.i64 gv44
+ v602 = symbol_value.i64 gv44
trap user2
block70:
@@ -1285,7 +1285,7 @@ block70:
brif v619, block141, block71
block141:
- v620 = global_value.i64 gv45
+ v620 = symbol_value.i64 gv45
trap user2
block71:
@@ -1308,7 +1308,7 @@ block71:
brif v633, block140, block72
block140:
- v634 = global_value.i64 gv46
+ v634 = symbol_value.i64 gv46
trap user2
block72:
@@ -1326,7 +1326,7 @@ block72:
brif v645, block139, block73
block139:
- v646 = global_value.i64 gv47
+ v646 = symbol_value.i64 gv47
trap user2
block73:
@@ -1353,7 +1353,7 @@ block74:
brif v663, block138, block75
block138:
- v664 = global_value.i64 gv48
+ v664 = symbol_value.i64 gv48
trap user2
block75:
@@ -1384,7 +1384,7 @@ block76:
brif v687, block137, block77
block137:
- v688 = global_value.i64 gv49
+ v688 = symbol_value.i64 gv49
trap user2
block77:
@@ -1411,7 +1411,7 @@ block81:
brif v702, block82, block88
block82:
- v703 = global_value.i64 gv50
+ v703 = symbol_value.i64 gv50
v1131 = iconst.i64 8
v704 = iadd v75, v1131
v705 = load.i64 v75
@@ -1430,7 +1430,7 @@ block82:
brif v715, block83, block84
block83:
- v716 = global_value.i64 gv51
+ v716 = symbol_value.i64 gv51
v717 = iconst.i64 3
v1133 = iconst.i64 8
v720 = iadd v80, v1133
@@ -1469,9 +1469,9 @@ block86:
jump block87
block87:
- v738 = global_value.i64 gv52
+ v738 = symbol_value.i64 gv52
call fn78(v76, v738)
- v739 = global_value.i64 gv53
+ v739 = symbol_value.i64 gv53
trap user1
block88:
@@ -1480,7 +1480,7 @@ block88:
brif v741, block89, block95(v1030, v1031, v1041, v1046, v1054, v1059)
block89:
- v742 = global_value.i64 gv54
+ v742 = symbol_value.i64 gv54
v1135 = iconst.i64 8
v743 = iadd v85, v1135
v744 = load.i64 v85
@@ -1499,7 +1499,7 @@ block89:
brif v754, block90, block91
block90:
- v755 = global_value.i64 gv55
+ v755 = symbol_value.i64 gv55
v756 = iconst.i64 3
v1137 = iconst.i64 8
v759 = iadd v90, v1137
@@ -1538,9 +1538,9 @@ block93:
jump block94
block94:
- v777 = global_value.i64 gv56
+ v777 = symbol_value.i64 gv56
call fn85(v86, v777)
- v778 = global_value.i64 gv57
+ v778 = symbol_value.i64 gv57
trap user1
block95(v779: i64, v780: i64, v1040: i64, v1045: i64, v1053: i16, v1058: i64):
@@ -1562,7 +1562,7 @@ block96:
brif v791, block136, block97
block136:
- v792 = global_value.i64 gv58
+ v792 = symbol_value.i64 gv58
trap user2
block97:
@@ -1574,7 +1574,7 @@ block97:
brif v798, block135, block98
block135:
- v799 = global_value.i64 gv59
+ v799 = symbol_value.i64 gv59
trap user2
block98:
@@ -1616,7 +1616,7 @@ block99(v804: i64, v1035: i64, v1037: i64, v1039: i64, v1044: i64, v1052: i16, v
brif v814, block134, block100
block134:
- v815 = global_value.i64 gv60
+ v815 = symbol_value.i64 gv60
trap user2
block100:
@@ -1638,7 +1638,7 @@ block100:
brif v827, block133, block101
block133:
- v828 = global_value.i64 gv61
+ v828 = symbol_value.i64 gv61
trap user2
block101:
@@ -1662,7 +1662,7 @@ block101:
brif v840, block132, block102
block132:
- v841 = global_value.i64 gv62
+ v841 = symbol_value.i64 gv62
trap user2
block102:
@@ -1684,7 +1684,7 @@ block102:
brif v853, block131, block103
block131:
- v854 = global_value.i64 gv63
+ v854 = symbol_value.i64 gv63
trap user2
block103:
@@ -1704,7 +1704,7 @@ block103:
brif v867, block130, block104
block130:
- v868 = global_value.i64 gv64
+ v868 = symbol_value.i64 gv64
trap user2
block104:
@@ -1723,7 +1723,7 @@ block104:
brif v879, block129, block105
block129:
- v880 = global_value.i64 gv65
+ v880 = symbol_value.i64 gv65
trap user2
block105:
@@ -1748,8 +1748,8 @@ block106:
brif v893, block107, block108
block107:
- v894 = global_value.i64 gv66
- v895 = global_value.i64 gv67
+ v894 = symbol_value.i64 gv66
+ v895 = symbol_value.i64 gv67
trap user1
block108:
@@ -1770,7 +1770,7 @@ block109(v896: i64):
brif v906, block128, block110
block128:
- v907 = global_value.i64 gv68
+ v907 = symbol_value.i64 gv68
trap user2
block110:
@@ -1781,7 +1781,7 @@ block110:
brif v913, block111, block127
block127:
- v914 = global_value.i64 gv69
+ v914 = symbol_value.i64 gv69
trap user2
block111:
@@ -1805,7 +1805,7 @@ block111:
brif v931, block126, block112
block126:
- v932 = global_value.i64 gv70
+ v932 = symbol_value.i64 gv70
trap user2
block112:
@@ -1831,7 +1831,7 @@ block113:
brif v949, block125, block114
block125:
- v950 = global_value.i64 gv71
+ v950 = symbol_value.i64 gv71
trap user2
block114:
@@ -1862,7 +1862,7 @@ block115:
brif v973, block123, block116
block123:
- v974 = global_value.i64 gv72
+ v974 = symbol_value.i64 gv72
trap user2
block116:
@@ -1880,7 +1880,7 @@ block116:
brif v985, block122, block117
block122:
- v986 = global_value.i64 gv73
+ v986 = symbol_value.i64 gv73
trap user2
block117:
@@ -1906,7 +1906,7 @@ block119:
brif v1002, block121, block120
block121:
- v1003 = global_value.i64 gv74
+ v1003 = symbol_value.i64 gv74
trap user2
block120: