From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 18 Apr 2019 17:30:45 +0000 (-0700)
Subject: write_json to not write contents (cells/wires) of whiteboxes
X-Git-Tag: working-ls180~1237^2~188
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79881141e2f9354a12df81277b82e011f52994ae;p=yosys.git

write_json to not write contents (cells/wires) of whiteboxes
---

diff --git a/backends/json/json.cc b/backends/json/json.cc
index f5c687981..b4f82a3fe 100644
--- a/backends/json/json.cc
+++ b/backends/json/json.cc
@@ -130,72 +130,75 @@ struct JsonWriter
 			f << stringf("        }");
 			first = false;
 		}
-		f << stringf("\n      },\n");
+		f << stringf("\n      }");
 
-		f << stringf("      \"cells\": {");
-		first = true;
-		for (auto c : module->cells()) {
-			if (use_selection && !module->selected(c))
-				continue;
-			f << stringf("%s\n", first ? "" : ",");
-			f << stringf("        %s: {\n", get_name(c->name).c_str());
-			f << stringf("          \"hide_name\": %s,\n", c->name[0] == '$' ? "1" : "0");
-			f << stringf("          \"type\": %s,\n", get_name(c->type).c_str());
-			if (aig_mode) {
-				Aig aig(c);
-				if (!aig.name.empty()) {
-					f << stringf("          \"model\": \"%s\",\n", aig.name.c_str());
-					aig_models.insert(aig);
+		if (!module->get_blackbox_attribute()) {
+			f << stringf(",\n      \"cells\": {");
+			first = true;
+			for (auto c : module->cells()) {
+				if (use_selection && !module->selected(c))
+					continue;
+				f << stringf("%s\n", first ? "" : ",");
+				f << stringf("        %s: {\n", get_name(c->name).c_str());
+				f << stringf("          \"hide_name\": %s,\n", c->name[0] == '$' ? "1" : "0");
+				f << stringf("          \"type\": %s,\n", get_name(c->type).c_str());
+				if (aig_mode) {
+					Aig aig(c);
+					if (!aig.name.empty()) {
+						f << stringf("          \"model\": \"%s\",\n", aig.name.c_str());
+						aig_models.insert(aig);
+					}
 				}
-			}
-			f << stringf("          \"parameters\": {");
-			write_parameters(c->parameters);
-			f << stringf("\n          },\n");
-			f << stringf("          \"attributes\": {");
-			write_parameters(c->attributes);
-			f << stringf("\n          },\n");
-			if (c->known()) {
-				f << stringf("          \"port_directions\": {");
+				f << stringf("          \"parameters\": {");
+				write_parameters(c->parameters);
+				f << stringf("\n          },\n");
+				f << stringf("          \"attributes\": {");
+				write_parameters(c->attributes);
+				f << stringf("\n          },\n");
+				if (c->known()) {
+					f << stringf("          \"port_directions\": {");
+					bool first2 = true;
+					for (auto &conn : c->connections()) {
+						string direction = "output";
+						if (c->input(conn.first))
+							direction = c->output(conn.first) ? "inout" : "input";
+						f << stringf("%s\n", first2 ? "" : ",");
+						f << stringf("            %s: \"%s\"", get_name(conn.first).c_str(), direction.c_str());
+						first2 = false;
+					}
+					f << stringf("\n          },\n");
+				}
+				f << stringf("          \"connections\": {");
 				bool first2 = true;
 				for (auto &conn : c->connections()) {
-					string direction = "output";
-					if (c->input(conn.first))
-						direction = c->output(conn.first) ? "inout" : "input";
 					f << stringf("%s\n", first2 ? "" : ",");
-					f << stringf("            %s: \"%s\"", get_name(conn.first).c_str(), direction.c_str());
+					f << stringf("            %s: %s", get_name(conn.first).c_str(), get_bits(conn.second).c_str());
 					first2 = false;
 				}
-				f << stringf("\n          },\n");
+				f << stringf("\n          }\n");
+				f << stringf("        }");
+				first = false;
 			}
-			f << stringf("          \"connections\": {");
-			bool first2 = true;
-			for (auto &conn : c->connections()) {
-				f << stringf("%s\n", first2 ? "" : ",");
-				f << stringf("            %s: %s", get_name(conn.first).c_str(), get_bits(conn.second).c_str());
-				first2 = false;
-			}
-			f << stringf("\n          }\n");
-			f << stringf("        }");
-			first = false;
-		}
-		f << stringf("\n      },\n");
+			f << stringf("\n      },\n");
 
-		f << stringf("      \"netnames\": {");
-		first = true;
-		for (auto w : module->wires()) {
-			if (use_selection && !module->selected(w))
-				continue;
-			f << stringf("%s\n", first ? "" : ",");
-			f << stringf("        %s: {\n", get_name(w->name).c_str());
-			f << stringf("          \"hide_name\": %s,\n", w->name[0] == '$' ? "1" : "0");
-			f << stringf("          \"bits\": %s,\n", get_bits(w).c_str());
-			f << stringf("          \"attributes\": {");
-			write_parameters(w->attributes);
-			f << stringf("\n          }\n");
-			f << stringf("        }");
-			first = false;
+			f << stringf("      \"netnames\": {");
+			first = true;
+			for (auto w : module->wires()) {
+				if (use_selection && !module->selected(w))
+					continue;
+				f << stringf("%s\n", first ? "" : ",");
+				f << stringf("        %s: {\n", get_name(w->name).c_str());
+				f << stringf("          \"hide_name\": %s,\n", w->name[0] == '$' ? "1" : "0");
+				f << stringf("          \"bits\": %s,\n", get_bits(w).c_str());
+				f << stringf("          \"attributes\": {");
+				write_parameters(w->attributes);
+				f << stringf("\n          }\n");
+				f << stringf("        }");
+				first = false;
+			}
+			f << stringf("\n      }");
 		}
-		f << stringf("\n      }\n");
+		f << stringf("\n");
 
 		f << stringf("    }");
 	}