Merge branch 'master' of https://github.com/enjoy-digital/litex

litex/build/xilinx/ise.py

@@ -180,11 +180,21 @@ class XilinxISEToolchain:
         return vns
 
     def add_period_constraint(self, platform, clk, period):
-        platform.add_platform_command("""NET "{clk}" TNM_NET = "GRP{clk}";
+        platform.add_platform_command(
-TIMESPEC "TS{clk}" = PERIOD "GRP{clk}" """ + str(period) + """ ns HIGH 50%;""",
+            """
-                                      clk=clk)
+NET "{clk}" TNM_NET = "PRD{clk}";
+TIMESPEC "TS{clk}" = PERIOD "PRD{clk}" """ + str(period) + """ ns HIGH 50%;
+""",
+            clk=clk,
+            )
 
     def add_false_path_constraint(self, platform, from_, to):
         platform.add_platform_command(
-            """TIMESPEC "TS{from_}TO{to}" = FROM "GRP{from_}" TO "GRP{to}" TIG;""",
+            """
-            from_=from_, to=to)
+NET "{from_}" TNM_NET = "TIG{from_}";
+NET "{to}" TNM_NET = "TIG{to}";
+TIMESPEC "TS{from_}TO{to}" = FROM "TIG{from_}" TO "TIG{to}" TIG;
+""",
+            from_=from_,
+            to=to,
+            )

litex/soc/interconnect/dma_lasmi.py

@@ -5,8 +5,8 @@ from litex.soc.interconnect import stream
 
 class Reader(Module):
     def __init__(self, lasmim, fifo_depth=None):
-        self.address = stream.Endpoint([("a", lasmim.aw)])
+        self.sink = sink = stream.Endpoint([("address", lasmim.aw)])
-        self.data = stream.Endpoint([("d", lasmim.dw)])
+        self.source = source = stream.Endpoint([("data", lasmim.dw)])
         self.busy = Signal()
 
         # # #
@@ -20,9 +20,9 @@ class Reader(Module):
 
         self.comb += [
             lasmim.we.eq(0),
-            lasmim.stb.eq(self.address.valid & request_enable),
+            lasmim.stb.eq(sink.valid & request_enable),
-            lasmim.adr.eq(self.address.a),
+            lasmim.adr.eq(sink.address),
-            self.address.ready.eq(lasmim.req_ack & request_enable),
+            sink.ready.eq(lasmim.req_ack & request_enable),
             request_issued.eq(lasmim.stb & lasmim.req_ack)
         ]
 
@@ -51,16 +51,17 @@ class Reader(Module):
             fifo.din.eq(lasmim.dat_r),
             fifo.we.eq(lasmim.dat_r_ack),
 
-            self.data.valid.eq(fifo.readable),
+            source.valid.eq(fifo.readable),
-            fifo.re.eq(self.data.ready),
+            fifo.re.eq(source.ready),
-            self.data.d.eq(fifo.dout),
+            source.data.eq(fifo.dout),
-            data_dequeued.eq(self.data.valid & self.data.ready)
+            data_dequeued.eq(source.valid & source.ready)
         ]
 
 
 class Writer(Module):
     def __init__(self, lasmim, fifo_depth=None):
-        self.address_data = stream.Endpoint([("a", lasmim.aw), ("d", lasmim.dw)])
+        self.source = source = stream.Endpoint([("address", lasmim.aw),
+                                                ("data", lasmim.dw)])
         self.busy = Signal()
 
         # # #
@@ -73,11 +74,11 @@ class Writer(Module):
 
         self.comb += [
             lasmim.we.eq(1),
-            lasmim.stb.eq(fifo.writable & self.address_data.valid),
+            lasmim.stb.eq(fifo.writable & source.valid),
-            lasmim.adr.eq(self.address_data.a),
+            lasmim.adr.eq(source.address),
-            self.address_data.ready.eq(fifo.writable & lasmim.req_ack),
+            source.ready.eq(fifo.writable & lasmim.req_ack),
-            fifo.we.eq(self.address_data.valid & lasmim.req_ack),
+            fifo.we.eq(source.valid & lasmim.req_ack),
-            fifo.din.eq(self.address_data.d)
+            fifo.din.eq(source.data)
         ]
 
         self.comb += [