Skip to content

fix: Fix nondeterminsm on aarch64 vs amd64 #7942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfecher merged 1 commit into from
Apr 7, 2025
Merged

fix: Fix nondeterminsm on aarch64 vs amd64 #7942

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions compiler/noirc_evaluator/src/brillig/brillig_gen/constant_allocation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
//! This module analyzes the usage of constants in a given function and decides an allocation point for them.
//! The allocation point will be the common dominator of all the places where the constant is used.
//! By allocating in the common dominator, we can cache the constants for all subsequent uses.
use fxhash::{FxHashMap as HashMap, FxHashSet as HashSet};

use std::collections::{BTreeMap, BTreeSet};

use crate::ssa::ir::{
basic_block::BasicBlockId,
Expand All @@ -16,18 +17,18 @@ use crate::ssa::ir::{

use super::variable_liveness::{collect_variables_of_value, variables_used_in_instruction};

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub(crate) enum InstructionLocation {
Instruction(InstructionId),
Terminator,
}

#[derive(Default)]
pub(crate) struct ConstantAllocation {
constant_usage: HashMap<ValueId, HashMap<BasicBlockId, Vec<InstructionLocation>>>,
allocation_points: HashMap<BasicBlockId, HashMap<InstructionLocation, Vec<ValueId>>>,
constant_usage: BTreeMap<ValueId, BTreeMap<BasicBlockId, Vec<InstructionLocation>>>,
allocation_points: BTreeMap<BasicBlockId, BTreeMap<InstructionLocation, Vec<ValueId>>>,
dominator_tree: DominatorTree,
blocks_within_loops: HashSet<BasicBlockId>,
blocks_within_loops: BTreeSet<BasicBlockId>,
}

impl ConstantAllocation {
Expand All @@ -37,8 +38,8 @@ impl ConstantAllocation {
let mut dominator_tree = DominatorTree::with_cfg_and_post_order(&cfg, &post_order);
let blocks_within_loops = find_all_blocks_within_loops(func, &cfg, &mut dominator_tree);
let mut instance = ConstantAllocation {
constant_usage: HashMap::default(),
allocation_points: HashMap::default(),
constant_usage: BTreeMap::default(),
allocation_points: BTreeMap::default(),
dominator_tree,
blocks_within_loops,
};
Expand Down Expand Up @@ -164,7 +165,7 @@ impl ConstantAllocation {
current_block
}

pub(crate) fn get_constants(&self) -> HashSet<ValueId> {
pub(crate) fn get_constants(&self) -> BTreeSet<ValueId> {
self.constant_usage.keys().copied().collect()
}
}
Expand All @@ -178,8 +179,8 @@ fn find_all_blocks_within_loops(
func: &Function,
cfg: &ControlFlowGraph,
dominator_tree: &mut DominatorTree,
) -> HashSet<BasicBlockId> {
let mut blocks_in_loops = HashSet::default();
) -> BTreeSet<BasicBlockId> {
let mut blocks_in_loops = BTreeSet::default();
for block_id in func.reachable_blocks() {
let block = &func.dfg[block_id];
let successors = block.successors();
Expand All @@ -199,8 +200,8 @@ fn find_blocks_in_loop(
header: BasicBlockId,
back_edge_start: BasicBlockId,
cfg: &ControlFlowGraph,
) -> HashSet<BasicBlockId> {
let mut blocks = HashSet::default();
) -> BTreeSet<BasicBlockId> {
let mut blocks = BTreeSet::default();
blocks.insert(header);

let mut insert = |block, stack: &mut Vec<BasicBlockId>| {
Expand Down
Loading