Merge pull request #77 from daveshah1/v2xml-work

Improvements to XML from Verilog Generation
mithro · Mar 15, 2018 · 49cc837 · 49cc837
2 parents 1bb486c + c63ee6c
commit 49cc837
Show file tree

Hide file tree

Showing 54 changed files with 375 additions and 587 deletions.
diff --git a/artix7/primitives/slicel/carry4/carry4.model.xml b/artix7/primitives/slicel/carry4/carry4.model.xml
diff --git a/artix7/primitives/slicel/carry4/carry4.pb_type.xml b/artix7/primitives/slicel/carry4/carry4.pb_type.xml
diff --git a/artix7/primitives/slicel/carry4/carry4.sim.v b/artix7/primitives/slicel/carry4/carry4.sim.v
diff --git a/artix7/primitives/slicel/carry4/carry4_complete/carry4/carry4.model.xml b/artix7/primitives/slicel/carry4/carry4_complete/carry4/carry4.model.xml
diff --git a/artix7/primitives/slicel/carry4/carry4_complete/carry4/carry4.pb_type.xml b/artix7/primitives/slicel/carry4/carry4_complete/carry4/carry4.pb_type.xml
diff --git a/artix7/primitives/slicel/carry4/carry4_complete/carry4_complete.model.xml b/artix7/primitives/slicel/carry4/carry4_complete/carry4_complete.model.xml
diff --git a/artix7/primitives/slicel/carry4/carry4_complete/carry4_complete.pb_type.xml b/artix7/primitives/slicel/carry4/carry4_complete/carry4_complete.pb_type.xml
diff --git a/artix7/primitives/slicel/carry4/carry4_complete/carry4_complete.sim.v b/artix7/primitives/slicel/carry4/carry4_complete/carry4_complete.sim.v
diff --git a/artix7/primitives/slicel/carry4/carry4_split/carry4_split.model.xml b/artix7/primitives/slicel/carry4/carry4_split/carry4_split.model.xml
diff --git a/artix7/primitives/slicel/carry4/carry4_split/carry4_split.pb_type.xml b/artix7/primitives/slicel/carry4/carry4_split/carry4_split.pb_type.xml
diff --git a/...arry4/carry4_complete/carry4/Makefile.v2x → ...imitives/slicel/carry4_modes/Makefile.v2x b/...arry4/carry4_complete/carry4/Makefile.v2x → ...imitives/slicel/carry4_modes/Makefile.v2x
diff --git a/...ry4/carry4_split/carry4_Nxor/Makefile.v2x → ...s/slicel/carry4_modes/carry4/Makefile.v2x b/...ry4/carry4_split/carry4_Nxor/Makefile.v2x → ...s/slicel/carry4_modes/carry4/Makefile.v2x
diff --git a/...arry4/carry4_complete/carry4/carry4.sim.v → ...s/slicel/carry4_modes/carry4/carry4.sim.v b/...arry4/carry4_complete/carry4/carry4.sim.v → ...s/slicel/carry4_modes/carry4/carry4.sim.v
diff --git a/artix7/primitives/slicel/carry4_modes/carry4_modes.sim.v b/artix7/primitives/slicel/carry4_modes/carry4_modes.sim.v
@@ -0,0 +1,23 @@
+`include "carry4/carry4.sim.v"
+`include "carry4_split/carry4_split.sim.v"
+
+(* MODES = "SPLIT; COMPLETE" *)
+module CARRY4_MODES(CO, O, CIN, DI, S);
+
+	output wire [3:0] CO;
+	output wire [3:0] O;
+	input CIN;
+	input [3:0] DI;
+	input [3:0] S;
+	parameter MODE = "SPLIT";
+
+	generate
+		if (MODE == "SPLIT") begin
+			CARRY4_SPLIT split_i(.CO(CO), .O(O), .CIN(CIN), .DI(DI), .S(S));
+		end else if (MODE == "COMPLETE") begin
+			CARRY4 complete_i(.CO(CO), .O(O), .CIN(CIN), .DI(DI), .S(S));
+		end
+	endgenerate
+
+
+endmodule
diff --git a/artix7/primitives/slicel/carry4_modes/carry4_split/Makefile.v2x b/artix7/primitives/slicel/carry4_modes/carry4_split/Makefile.v2x
diff --git a/...arry4/carry4_split/carry4_Nmux/Makefile.N → ...modes/carry4_split/carry4_Nmux/Makefile.N b/...arry4/carry4_split/carry4_Nmux/Makefile.N → ...modes/carry4_split/carry4_Nmux/Makefile.N
diff --git a/...ry4/carry4_split/carry4_Nmux/Makefile.mux → ...des/carry4_split/carry4_Nmux/Makefile.mux b/...ry4/carry4_split/carry4_Nmux/Makefile.mux → ...des/carry4_split/carry4_Nmux/Makefile.mux
diff --git a/...arry4/carry4_split/carry4_Nxor/Makefile.N → ...modes/carry4_split/carry4_Nxor/Makefile.N b/...arry4/carry4_split/carry4_Nxor/Makefile.N → ...modes/carry4_split/carry4_Nxor/Makefile.N
diff --git a/artix7/primitives/slicel/carry4_modes/carry4_split/carry4_Nxor/Makefile.v2x b/artix7/primitives/slicel/carry4_modes/carry4_split/carry4_Nxor/Makefile.v2x
diff --git a/...t/carry4_Nxor/ntemplate.carry4_Nxor.sim.v → ...t/carry4_Nxor/ntemplate.carry4_Nxor.sim.v b/...t/carry4_Nxor/ntemplate.carry4_Nxor.sim.v → ...t/carry4_Nxor/ntemplate.carry4_Nxor.sim.v
diff --git a/...el/carry4/carry4_split/carry4_split.sim.v → ...ry4_modes/carry4_split/carry4_split.sim.v b/...el/carry4/carry4_split/carry4_split.sim.v → ...ry4_modes/carry4_split/carry4_split.sim.v
@@ -9,7 +9,6 @@
 `include "carry4_Nxor/carry4_cxor.sim.v"
 `include "carry4_Nxor/carry4_dxor.sim.v"
 
-(* ALTERNATIVE_TO="CARRY4_TOP" *)
 module CARRY4_SPLIT(CO, O, CIN, DI, S);
 
 	output wire [3:0] CO;

diff --git a/artix7/primitives/slicel/slicel.model.xml b/artix7/primitives/slicel/slicel.model.xml
@@ -1,5 +1,5 @@
 <models xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="carry4/carry4.model.xml"       xpointer="xpointer(models/child::node())" />
+ <xi:include href="carry4_modes/carry4_modes.model.xml"       xpointer="xpointer(models/child::node())" />
  <xi:include href="muxes/f8mux/f8mux.model.xml"   xpointer="xpointer(models/child::node())" />
  <xi:include href="muxes/f7amux/f7amux.model.xml" xpointer="xpointer(models/child::node())" />
  <xi:include href="muxes/f7bmux/f7bmux.model.xml" xpointer="xpointer(models/child::node())" />