mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-07-05 23:16:13 +00:00
Code Activity

Get rid of normalize_to_width.

Browse source
This commit is contained in:
nella 2026-06-11 01:12:35 +02:00
parent c44d24d9fd
commit 135c2a4113
3 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/compressor_tree.cc
View file

@ -43,23 +43,6 @@ std::pair<SigSpec, SigSpec> emit_compressor_42(Module *module, SigSpec a, SigSpe
return {sum, carry}; return {sum, carry};
} }
SigSpec normalize_to_width(SigSpec sig, bool is_signed, int width)
{
// Zero/sign-extend to width
if (GetSize(sig) < width) {
SigBit pad;
if (is_signed && GetSize(sig) > 0)
pad = sig[GetSize(sig) - 1];
else
pad = State::S0;
sig.append(SigSpec(pad, width - GetSize(sig)));
}
// Truncate to width
if (GetSize(sig) > width)
sig = sig.extract(0, width);
return sig;
}
std::vector<DepthSig> generate_partial_products(Module *module, SigSpec a, SigSpec b, bool a_signed, bool b_signed, int width) { std::vector<DepthSig> generate_partial_products(Module *module, SigSpec a, SigSpec b, bool a_signed, bool b_signed, int width) {
int width_a = GetSize(a); int width_a = GetSize(a);
int width_b = GetSize(b); int width_b = GetSize(b);
@ -72,7 +55,7 @@ std::vector<DepthSig> generate_partial_products(Module *module, SigSpec a, SigSp
// b_shifted = (0_i ## b) // b_shifted = (0_i ## b)
SigSpec b_shifted = SigSpec(State::S0, i); SigSpec b_shifted = SigSpec(State::S0, i);
b_shifted.append(b); b_shifted.append(b);
b_shifted = normalize_to_width(b_shifted, false, width); b_shifted.extend_u0(width, false);
// row = b_shifted & replicate(a[i], width) // row = b_shifted & replicate(a[i], width)
SigSpec ai_rep = SigSpec(ai, width); SigSpec ai_rep = SigSpec(ai, width);
@ -333,8 +316,8 @@ FinalAdder pick_final_adder(int width, int final_depth, FinalMode mode) {
case FinalMode::PREFIX: return FinalAdder::PARALLEL_PREFIX; case FinalMode::PREFIX: return FinalAdder::PARALLEL_PREFIX;
case FinalMode::AUTO: case FinalMode::AUTO:
default: { default: {
bool wide = width >= RIPPLE_PREFIX_THRESHOLD; bool wide = width >= RIPPLE_PREFIX_WIDTH_THRESHOLD;
bool deep = final_depth >= PREFIX_DEPTH_THRESHOLD; bool deep = final_depth >= RIPPLE_PREFIX_DEPTH_THRESHOLD;
return (wide && deep) ? FinalAdder::PARALLEL_PREFIX : FinalAdder::DEFAULT; return (wide && deep) ? FinalAdder::PARALLEL_PREFIX : FinalAdder::DEFAULT;
} }
} }

6
kernel/compressor_tree.h
View file

@ -30,8 +30,8 @@ namespace CompressorTree
{ {
// Width and depth thresholds below which a ripple is preferred over parallel-prefix // Width and depth thresholds below which a ripple is preferred over parallel-prefix
constexpr int RIPPLE_PREFIX_THRESHOLD = 16; constexpr int RIPPLE_PREFIX_WIDTH_THRESHOLD = 16;
constexpr int PREFIX_DEPTH_THRESHOLD = 5; constexpr int RIPPLE_PREFIX_DEPTH_THRESHOLD = 5;
enum class Strategy { enum class Strategy {
FA_ONLY, // 3:2 compressors FA_ONLY, // 3:2 compressors
@ -59,8 +59,6 @@ enum class FinalMode {
std::pair<SigSpec, SigSpec> emit_compressor_32(Module *module, SigSpec a, SigSpec b, SigSpec c, int width); std::pair<SigSpec, SigSpec> emit_compressor_32(Module *module, SigSpec a, SigSpec b, SigSpec c, int width);
std::pair<SigSpec, SigSpec> emit_compressor_42(Module *module, SigSpec a, SigSpec b, SigSpec c, SigSpec d, int width); std::pair<SigSpec, SigSpec> emit_compressor_42(Module *module, SigSpec a, SigSpec b, SigSpec c, SigSpec d, int width);
SigSpec normalize_to_width(SigSpec sig, bool is_signed, int width);
/** /**
* generate_partial_products() - Generate partial products for FMA concat * generate_partial_products() - Generate partial products for FMA concat
* @module:The Yosys module to which the compressors will be added * @module:The Yosys module to which the compressors will be added

6
passes/techmap/arith_tree.cc
View file

@ -304,10 +304,10 @@ struct ArithTreeWorker {
for (auto &op : operands) { for (auto &op : operands) {
if (GetSize(op.factor_b) == 0) { if (GetSize(op.factor_b) == 0) {
// Additive operand // Additive operand
SigSpec s = CompressorTree::normalize_to_width(op.sig, op.is_signed, width); op.sig.extend_u0(width, op.is_signed);
if (op.negate) if (op.negate)
s = module->Not(NEW_ID, s); op.sig = module->Not(NEW_ID, op.sig);
pool.push_back({s, 0}); pool.push_back({op.sig, 0});
} else { } else {
// Multiplicative operand // Multiplicative operand
auto pps = CompressorTree::generate_partial_products(module, op.sig, op.factor_b, op.is_signed, op.factor_b_signed, width); auto pps = CompressorTree::generate_partial_products(module, op.sig, op.factor_b, op.is_signed, op.factor_b_signed, width);