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

diff --cc README.md
Simple merge

diff --cc kernel/celltypes.h
Simple merge

diff --cc kernel/rtlil.h
Simple merge

diff --cc passes/cmds/stat.cc
index 3909c4c8cf44cf15fe87c082ff29fe7c02227560,d22685b62954bfd9b17888618a220e6038c4e634..c42f7fcdd787a50707e415e6580559cbc6329e53
--- 1/passes/cmds/stat.cc
--- 2/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;
  
-                       statdata_t data(design, mod, width_mode, cell_area);
 +                      if (mod->attributes.count("\\abc_box_id"))
 +                              continue;
 +
+                       statdata_t data(design, mod, width_mode, cell_area, techname);
                        mod_stat[mod->name] = data;
  
                        log("\n");

diff --cc passes/pmgen/README.md
Simple merge

diff --cc passes/sat/expose.cc
Simple merge

diff --cc techlibs/ice40/cells_sim.v
Simple merge

diff --cc techlibs/xilinx/cells_map.v
Simple merge

diff --cc techlibs/xilinx/synth_xilinx.cc
index a1c4acf7e2cdbfd6603a1dd2633c2fcc121a7d82,c20cac09b5aa521a40af7d1bd293cc576d3a7655..e9a3b53a0a6cbfecebdb72093b877fdc48e9db6f
--- 1/techlibs/xilinx/synth_xilinx.cc
--- 2/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

diff --cc tests/tools/autotest.sh
Simple merge