From a7f894160692ca6110555f1e6dbdb8657a727309 Mon Sep 17 00:00:00 2001
From: jameshegarty <jameshegarty@gmail.com>
Date: Tue, 3 Apr 2018 09:53:13 -0700
Subject: [PATCH] wrapper verilog fixes (#110)

fixed syntax errors in wrapper.
---
 examples/1pxout.lua        |  16 ++++++++++++
 examples/gold/1pxout.bmp   | Bin 0 -> 58 bytes
 platform/axi/conf_nports.v |  49 +++++++++++++++++++++++--------------
 platform/axi/dramwriter.v  |   3 ++-
 src/types.lua              |   2 +-
 5 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 examples/1pxout.lua
 create mode 100644 examples/gold/1pxout.bmp

diff --git a/examples/1pxout.lua b/examples/1pxout.lua
new file mode 100644
index 0000000..e6e8971
--- /dev/null
+++ b/examples/1pxout.lua
@@ -0,0 +1,16 @@
+local R = require "rigel"
+local RM = require "modules"
+local ffi = require("ffi")
+local types = require("types")
+types.export()
+local S = require("systolic")
+local harness = require "harness"
+local C = require "examplescommon"
+require "common".export()
+
+W = 15
+H = 15
+T = 1
+
+
+harness{ outFile="1pxout", fn=RM.liftHandshake(RM.liftDecimate(RM.reduceSeq(C.sum(u(8),u(8),u(8),true),1/(W*H)))), inFile="15x15.raw", inSize={W,H}, outSize={1,1} }
diff --git a/examples/gold/1pxout.bmp b/examples/gold/1pxout.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..c67a23b0455b280289141d86361b12b96a12bc2f
GIT binary patch
literal 58
dcmZ?rwPb(*Ga#h_#Eft(0g=E$9zJ}S0RTth1B(Cv

literal 0
HcmV?d00001

diff --git a/platform/axi/conf_nports.v b/platform/axi/conf_nports.v
index aa5a9d3..5855c60 100644
--- a/platform/axi/conf_nports.v
+++ b/platform/axi/conf_nports.v
@@ -1,5 +1,8 @@
 
-module Conf(
+module Conf #(parameter ADDR_BASE = 32'd0,
+              parameter NREG = 4,
+              parameter W = 32
+)(
     input ACLK,
     input ARESETN,
     //AXI Inputs
@@ -45,7 +48,7 @@ module Conf(
     wire LITE_AWVALID;
     wire LITE_BREADY;
     reg [1:0] LITE_BRESP;
-    wire LITE_BVALID;
+    reg LITE_BVALID;
     reg [31:0] LITE_RDATA;
     wire LITE_RREADY;
     reg [1:0] LITE_RRESP;
@@ -100,14 +103,10 @@ module Conf(
     .M_AXI_WVALID(LITE_WVALID)
   );
 
-   parameter ADDR_BASE = 32'd0;
-   
-parameter NREG = 4;
-parameter W = 32;
 
 reg [W-1:0] data[NREG-1:0];
 
-parameter IDLE = 0, RWAIT = 1;
+parameter IDLE = 0, RWAIT = 1, RWAIT2 = 2;
 parameter OK = 2'b00, SLVERR = 2'b10;
 
 reg [31:0] counter;
@@ -140,7 +139,7 @@ always @(posedge ACLK) begin
 end 
 
 //WRITES
-reg w_state;
+reg [1:0] w_state;
 reg [9:0] w_select_r;
 reg w_wrotedata;
 reg w_wroteresp;
@@ -153,15 +152,17 @@ assign aw_good = {LITE_AWADDR[31:12], 10'b00, LITE_AWADDR[1:0]} == ADDR_BASE;
 
 assign LITE_AWREADY = (w_state == IDLE);
 assign LITE_WREADY = (w_state == RWAIT) && !w_wrotedata;
-assign LITE_BVALID = (w_state == RWAIT) && !w_wroteresp;
+//assign LITE_BVALID = (w_state == RWAIT) && !w_wroteresp;
 
 always @(posedge ACLK) begin
     if(ARESETN == 0) begin
         w_state <= IDLE;
         w_wrotedata <= 0;
         w_wroteresp <= 0;
+        LITE_BVALID <= 1'b0;
     end else case(w_state)
         IDLE: begin
+            LITE_BVALID <= 1'b0;
             if(LITE_AWVALID) begin
                 LITE_BRESP <= aw_good ? OK : SLVERR;
                 w_select_r <= w_select;
@@ -171,17 +172,27 @@ always @(posedge ACLK) begin
             end
         end
         RWAIT: begin
-            if (LITE_WREADY)
-                data[w_select_r] <= LITE_WDATA;
-            if((w_wrotedata || LITE_WVALID) && (w_wroteresp || LITE_BREADY)) begin
-                w_wrotedata <= 0;
-                w_wroteresp <= 0;
-                w_state <= IDLE;
-            end else if (LITE_WVALID)
-                w_wrotedata <= 1;
-            else if (LITE_BREADY)
-                w_wroteresp <= 1;
+           if (LITE_WREADY) begin
+              data[w_select_r] <= LITE_WDATA;
+           end
+           
+           if((w_wrotedata || LITE_WVALID) && (w_wroteresp || LITE_BREADY)) begin
+              w_wrotedata <= 0;
+              w_wroteresp <= 0;
+           end else if (LITE_WVALID) begin
+             w_wrotedata <= 1;
+           end else if (LITE_BREADY) begin
+             w_wroteresp <= 1;
+           end
+
+           if (LITE_WVALID &&  LITE_WREADY) begin
+              w_state <= RWAIT2;
+           end
         end
+        RWAIT2: begin
+           LITE_BVALID <= 1'b1;
+           w_state <= IDLE;
+        end   
     endcase
 end
 
diff --git a/platform/axi/dramwriter.v b/platform/axi/dramwriter.v
index 9aadb05..0e92f9c 100644
--- a/platform/axi/dramwriter.v
+++ b/platform/axi/dramwriter.v
@@ -71,6 +71,8 @@ end
 //WRITE logic
 reg [31:0] b_count;
 reg w_state;
+reg [3:0] last_count;
+
 always @(posedge ACLK) begin
     if (ARESETN == 0) begin
         w_state <= IDLE;
@@ -96,7 +98,6 @@ always @(posedge ACLK) begin
     endcase
 end
 
-reg [3:0] last_count;
 assign M_AXI_WLAST = last_count == 4'b0000;
 
 assign M_AXI_WVALID = (w_state == RWAIT) && DATA_VALID;
diff --git a/src/types.lua b/src/types.lua
index e86e647..b82392f 100644
--- a/src/types.lua
+++ b/src/types.lua
@@ -695,7 +695,7 @@ function types.export(t)
   rawset(t,"u",types.uint)
   rawset(t,"i",types.int)
   rawset(t,"b",types.bits)
-  rawset(t,"bool",types.bool(false))
+--  rawset(t,"bool",types.bool(false)) -- used in terra!!
   rawset(t,"ar",types.array)
   rawset(t,"tup",types.tuple)
 end