From 8ae1c02d4dbd259adf326fae0e2fc2fc7a30a593 Mon Sep 17 00:00:00 2001 From: Lofty Date: Tue, 25 Jun 2024 23:18:57 +0100 Subject: [PATCH] remove sorts from some optimisation passes --- passes/opt/opt.cc | 1 - passes/opt/opt_clean.cc | 1 - techlibs/ice40/ice40_opt.cc | 1 - tests/arch/anlogic/mux.ys | 6 ++++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/passes/opt/opt.cc b/passes/opt/opt.cc index dc88563c2..453dbc125 100644 --- a/passes/opt/opt.cc +++ b/passes/opt/opt.cc @@ -182,7 +182,6 @@ struct OptPass : public Pass { } design->optimize(); - design->sort(); design->check(); log_header(design, fast_mode ? "Finished fast OPT passes.\n" : "Finished OPT passes. (There is nothing left to do.)\n"); diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc index ba39b9c80..655421115 100644 --- a/passes/opt/opt_clean.cc +++ b/passes/opt/opt_clean.cc @@ -745,7 +745,6 @@ struct CleanPass : public Pass { log("Removed %d unused cells and %d unused wires.\n", count_rm_cells, count_rm_wires); design->optimize(); - design->sort(); design->check(); keep_cache.reset(); diff --git a/techlibs/ice40/ice40_opt.cc b/techlibs/ice40/ice40_opt.cc index b13d33018..cf6c4ec77 100644 --- a/techlibs/ice40/ice40_opt.cc +++ b/techlibs/ice40/ice40_opt.cc @@ -257,7 +257,6 @@ struct Ice40OptPass : public Pass { } design->optimize(); - design->sort(); design->check(); log_header(design, "Finished OPT passes. (There is nothing left to do.)\n"); diff --git a/tests/arch/anlogic/mux.ys b/tests/arch/anlogic/mux.ys index 89014b5e0..bbe053e84 100644 --- a/tests/arch/anlogic/mux.ys +++ b/tests/arch/anlogic/mux.ys @@ -39,6 +39,8 @@ proc equiv_opt -assert -map +/anlogic/cells_sim.v synth_anlogic # equivalency check design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design) cd mux16 # Constrain all select calls below inside the top module -select -assert-count 5 t:AL_MAP_LUT6 +select -assert-count 3 t:AL_MAP_LUT3 +select -assert-count 8 t:AL_MAP_LUT4 +select -assert-count 1 t:AL_MAP_LUT5 -select -assert-none t:AL_MAP_LUT6 %% t:* %D +select -assert-none t:AL_MAP_LUT3 t:AL_MAP_LUT4 t:AL_MAP_LUT5 %% t:* %D