From: Eddie Hung <eddie@fpgeh.com>
Date: Tue, 21 May 2019 21:21:00 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master' into xc7mux
X-Git-Tag: working-ls180~1208^2~291
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb09c6219b057100d2e43028ec710888c20924fd;p=yosys.git

Merge remote-tracking branch 'origin/master' into xc7mux
---

fb09c6219b057100d2e43028ec710888c20924fd
diff --cc passes/cmds/stat.cc
index 3909c4c8c,d22685b62..c42f7fcdd
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@@ -269,10 -339,7 +339,10 @@@ struct StatPass : public Pass 
  				if (mod->get_bool_attribute("\\top"))
  					top_mod = mod;
  
 +			if (mod->attributes.count("\\abc_box_id"))
 +				continue;
 +
- 			statdata_t data(design, mod, width_mode, cell_area);
+ 			statdata_t data(design, mod, width_mode, cell_area, techname);
  			mod_stat[mod->name] = data;
  
  			log("\n");
diff --cc techlibs/xilinx/synth_xilinx.cc
index a1c4acf7e,c20cac09b..e9a3b53a0
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -89,8 -84,8 +93,8 @@@ struct SynthXilinxPass : public ScriptP
  		log("\n");
  	}
  
- 	std::string top_opt, edif_file, blif_file, abc;
 -	std::string top_opt, edif_file, blif_file, arch;
 -	bool flatten, retime, vpr, nobram, nodram, nosrl;
++	std::string top_opt, edif_file, blif_file, abc, arch;
 +	bool flatten, retime, vpr, nocarry, nobram, nodram, nosrl, nomux;
  
  	void clear_flags() YS_OVERRIDE
  	{
@@@ -101,10 -95,10 +105,12 @@@
  		flatten = false;
  		retime = false;
  		vpr = false;
++		nocarry = false;
  		nobram = false;
  		nodram = false;
  		nosrl = false;
 +		nomux = false;
+ 		arch = "xc7";
  	}
  
  	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE