mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-11-04 05:19:11 +00:00 
			
		
		
		
	Merge pull request #1213 from YosysHQ/eddie/wreduce_add
wreduce/opt_expr: improve width reduction for $add and $sub cells
This commit is contained in:
		
						commit
						e9a756aa7a
					
				
					 5 changed files with 226 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -641,6 +641,31 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
 | 
			
		|||
					did_something = true;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			if (cell->type.in("$add", "$sub")) {
 | 
			
		||||
				RTLIL::SigSpec sig_a = assign_map(cell->getPort("\\A"));
 | 
			
		||||
				RTLIL::SigSpec sig_b = assign_map(cell->getPort("\\B"));
 | 
			
		||||
				RTLIL::SigSpec sig_y = cell->getPort("\\Y");
 | 
			
		||||
				bool sub = cell->type == "$sub";
 | 
			
		||||
 | 
			
		||||
				int i;
 | 
			
		||||
				for (i = 0; i < GetSize(sig_y); i++) {
 | 
			
		||||
					if (sig_b.at(i, State::Sx) == State::S0 && sig_a.at(i, State::Sx) != State::Sx)
 | 
			
		||||
						module->connect(sig_y[i], sig_a[i]);
 | 
			
		||||
					else if (!sub && sig_a.at(i, State::Sx) == State::S0 && sig_b.at(i, State::Sx) != State::Sx)
 | 
			
		||||
						module->connect(sig_y[i], sig_b[i]);
 | 
			
		||||
					else
 | 
			
		||||
						break;
 | 
			
		||||
				}
 | 
			
		||||
				if (i > 0) {
 | 
			
		||||
					cover_list("opt.opt_expr.fine", "$add", "$sub", cell->type.str());
 | 
			
		||||
					cell->setPort("\\A", sig_a.extract_end(i));
 | 
			
		||||
					cell->setPort("\\B", sig_b.extract_end(i));
 | 
			
		||||
					cell->setPort("\\Y", sig_y.extract_end(i));
 | 
			
		||||
					cell->fixup_parameters();
 | 
			
		||||
					did_something = true;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if (cell->type == "$reduce_xor" || cell->type == "$reduce_xnor" || cell->type == "$shift" || cell->type == "$shiftx" ||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -342,9 +342,9 @@ struct WreduceWorker
 | 
			
		|||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if (cell->type.in("$pos", "$add", "$mul", "$and", "$or", "$xor"))
 | 
			
		||||
		if (cell->type.in("$pos", "$add", "$mul", "$and", "$or", "$xor", "$sub"))
 | 
			
		||||
		{
 | 
			
		||||
			bool is_signed = cell->getParam("\\A_SIGNED").as_bool();
 | 
			
		||||
			bool is_signed = cell->getParam("\\A_SIGNED").as_bool() || cell->type == "$sub";
 | 
			
		||||
 | 
			
		||||
			int a_size = 0, b_size = 0;
 | 
			
		||||
			if (cell->hasPort("\\A")) a_size = GetSize(cell->getPort("\\A"));
 | 
			
		||||
| 
						 | 
				
			
			@ -352,7 +352,7 @@ struct WreduceWorker
 | 
			
		|||
 | 
			
		||||
			int max_y_size = max(a_size, b_size);
 | 
			
		||||
 | 
			
		||||
			if (cell->type == "$add")
 | 
			
		||||
			if (cell->type.in("$add", "$sub"))
 | 
			
		||||
				max_y_size++;
 | 
			
		||||
 | 
			
		||||
			if (cell->type == "$mul")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue