Added -nomap option to memory pass

diff --git a/passes/memory/memory.cc b/passes/memory/memory.cc
index 79f0770b857ec92a8bbb97eb5475cf4e5f8ac1be..6968d58ba23b8f00cde4b3ed7c0478665fa8f081 100644 (file)
--- a/passes/memory/memory.cc
+++ b/passes/memory/memory.cc
@@ -28,26 +28,40 @@ struct MemoryPass : public Pass {
        {
                //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
                log("\n");
-               log("    memory [selection]\n");
+               log("    memory [-nomap] [selection]\n");
                log("\n");
                log("This pass calls all the other memory_* passes in a useful order:\n");
                log("\n");
                log("    memory_dff\n");
                log("    memory_collect\n");
-               log("    memory_map\n");
+               log("    memory_map          (skipped if called with -nomap)\n");
                log("\n");
-               log("This converts memories to word-wide DFFs and address decoders.\n");
+               log("This converts memories to word-wide DFFs and address decoders\n");
+               log("or moultiport memory blocks if called with the -nomap option.\n");
                log("\n");
        }
        virtual void execute(std::vector<std::string> args, RTLIL::Design *design)
        {
+               bool flag_nomap = false;
+
                log_header("Executing MEMORY pass.\n");
                log_push();
 
-               extra_args(args, 1, design);
+               size_t argidx;
+               for (argidx = 1; argidx < args.size(); argidx++) {
+                       if (args[argidx] == "-nomap") {
+                               flag_nomap = true;
+                               continue;
+                       }
+                       break;
+               }
+               extra_args(args, argidx, design);
+
                Pass::call(design, "memory_dff");
                Pass::call(design, "memory_collect");
-               Pass::call(design, "memory_map");
+
+               if (!flag_nomap)
+                       Pass::call(design, "memory_map");
 
                log_pop();
        }