precomputed arithemtic

src/ganimede/ganimede.vhd

@@ -10,6 +10,9 @@ use gan_manager.management_types.all;
 library gan_buffer;
 
 entity ganimede_toplevel is
+  generic (
+    tech : integer := 0
+          );
   port (
     clk               : in  std_logic;
     rst               : in  std_logic;
@@ -41,6 +44,7 @@ begin
   --- INTERNAL CONNECTIONS ---
   ip_to_socbridge_driver.fifo <= buffer_to_socbridge_driver;
   ip_to_socbridge_driver.flush <= ip_to_ganimede.socbridge.flush;
+  ganimede_to_ip.socbridge.used_slots <= 0;
 
   --- DRIVER INSTANTIATION ---
   socbridge_driver_inst: entity gan_socbridge.socbridge_driver
@@ -80,8 +84,8 @@ begin
 
   fifo_buffer_to_ip_inst : entity gan_buffer.fifo_buffer
     generic map (
-      buffer_size => 1024
+      buffer_size => 1024,
-      --tech => 60
+      tech => tech
     )
     port map(
       in_clk => socbridge_clk,
@@ -97,8 +101,8 @@ begin
 
   fifo_buffer_from_ip_inst : entity gan_buffer.fifo_buffer
     generic map (
-      buffer_size => 1024
+      buffer_size => 1024,
---      tech => 60
+      tech => tech
     )
     port map(
       in_clk => clk, 

src/manager/management_unit.vhd

@@ -53,20 +53,22 @@ begin
   manager_to_socbridge_driver.ready <= '1';
   manager_to_socbridge_driver.data <= pack(manager_state.memory(local_word_address));
   manager_to_socbridge_driver.valid <= '1';
-  word_address  <= local_word_address;
+  word_address <= local_word_address;
   manager_to_controller.cmd <= cmd;
 end process comb_proc;
 
 -- tre sorters sätt att avsluta en skrivning:
 -- timeout om vi villha det
--- en lastbit genooom axi interface
+-- en lastbit genom axi interface
 -- vi har fått all data vi begärde.
 
 seq_proc: process(clk)
 begin
   if rising_edge(clk) then
     if rst = '1' then
-      manager_state <= manager_state_reset_val;
+      manager_state.data_out <= manager_word_reset_val;
+      manager_state.memory(0).reserved(0) <= '0';
+      manager_state.memory(1).reserved(0) <= '0';
     else
       -- Write data from SoCBridge driver to address
       if socbridge_driver_to_manager.valid = '1' then
@@ -78,20 +80,20 @@ begin
       -- Is the controller done executing an instruction
       else
         if controller_to_manager.done_reading = '1' then
-          manager_state.memory(0) <= manager_word_reset_val;
+          manager_state.memory(0).reserved(0) <= '0';
         end if;
         if controller_to_manager.done_writing = '1' then
-          manager_state.memory(1) <= manager_word_reset_val;
+          manager_state.memory(1).reserved(0) <= '0';
         end if;
       end if;
       -- Is there a read instruction in memory
-      if pack(read_address) /= empty_word and controller_to_manager.ready = '1' and controller_to_manager.done_reading = '0' then
+      if read_address.reserved(0) = '1' and controller_to_manager.ready = '1' and controller_to_manager.done_reading = '0' then
         manager_to_controller.address <= read_address.address & "0000000000";
         manager_to_controller.driver_id <= "1"; -- Only supprts one driver at present
         manager_to_controller.seq_mem_access_count <= 2**to_integer(unsigned(read_address.size)) * 2**10;
         cmd <= "10";
       -- Is there a write instruction in memory
-      elsif pack(write_address) /= empty_word and controller_to_manager.ready = '1' and controller_to_manager.done_writing = '0'then
+      elsif write_address.reserved(0) = '1' and controller_to_manager.ready = '1' and controller_to_manager.done_writing = '0'then
         manager_to_controller.address <= write_address.address & "0000000000";
         manager_to_controller.driver_id <= "1"; -- Only supports one driver at present
         manager_to_controller.seq_mem_access_count <= 2**to_integer(unsigned(read_address.size)) * 2**10;

src/manager/management_unit_pkg.vhd

@@ -16,7 +16,8 @@ package management_types is
     reserved: std_logic_vector(WORD_SIZE - 1 - (22 + 4 + 3) downto 0);
   end record manager_word_t;
   constant empty_word : std_logic_vector(WORD_SIZE - 1 downto 0) := (others => '0');
-  constant mem_words : natural := 64;
+  constant mem_words : natural := 2;
+  constant min_bits_to_determine_address : natural := natural(CEIL(LOG2(real(mem_words))));
   constant address_mask : std_logic_vector(WORD_SIZE - 1 downto 0) := std_logic_vector(to_unsigned(mem_words - 1, 32));
   type memory_t is array (0 to mem_words - 1) of manager_word_t;
 

src/socbridge/socbridge_driver.vhd

@@ -13,7 +13,7 @@ use grlib.stdlib.all;
 
 entity socbridge_driver is
   generic(
-    MAX_PKT_SIZE : integer range 1 to 128 := 32
+    MAX_PKT_SIZE : natural range 1 to 128 := 8
          );
   port(
     clk                            : in std_logic;
@@ -31,13 +31,16 @@ entity socbridge_driver is
 end entity socbridge_driver;
 
 architecture rtl of socbridge_driver is
+  type slice is array(0 to 3) of natural;
+  constant next_slice_32_8_upper : slice := (31, 7, 15, 23);
+  constant next_slice_32_8_lower : slice := (24, 0, 8, 15);
 
   signal next_parity_out                           : std_logic;
   signal ext_to_socbridge_driver_rec               : ext_protocol_t;
-  signal next_data_out : std_logic_vector(interface_inst.socbridge.payload_width - 1 downto 0);
+  signal next_data_out                             : std_logic_vector(interface_inst.socbridge.payload_width - 1 downto 0);
-  signal next_rx_transaction                   : transaction_t;
+  signal next_rx_transaction                       : transaction_t;
-  signal next_tx_transaction                   : transaction_t;
+  signal next_tx_transaction                       : transaction_t;
-  signal next_tx_data_size, next_rx_data_size          : integer;
+  signal next_tx_data_size, next_rx_data_size      : natural;
   signal next_rx_state                             : rx_state_t;
   signal next_tx_state                             : tx_state_t;
   signal st                                        : state_rec_t;
@@ -54,6 +57,7 @@ begin
   ext_to_socbridge_driver_rec.clk <= ext_to_socbridge_driver.control(1);
   ext_to_socbridge_driver_rec.parity <= ext_to_socbridge_driver.control(0);
   socbridge_clk <= ext_to_socbridge_driver_rec.clk;
+  socbridge_driver_to_ip.used_slots <= 0;
   
   comb_proc: process(ext_to_socbridge_driver, ip_to_socbridge_driver, 
                      st, controller_to_socbridge_driver, trans_st,
@@ -104,7 +108,11 @@ begin
       --- ### TX NEXT STATE ASSIGNMENTS ### ---
     case st.curr_tx_state is
       when IDLE =>
-        if local_next_tx_transaction /= NO_OP then
+        if (local_next_tx_transaction = WRITE or local_next_tx_transaction = WRITE_ADD) and not st.write_in_flight then
+          next_tx_state <= TX_HEADER;
+        elsif (local_next_tx_transaction = READ or local_next_tx_transaction = READ_ADD) and not st.read_in_flight then
+          next_tx_state <= TX_HEADER;
+        elsif local_next_tx_transaction = READ_RESPONSE or local_next_tx_transaction = WRITE_ACK then
           next_tx_state <= TX_HEADER;
         else 
           next_tx_state <= IDLE;
@@ -116,7 +124,7 @@ begin
         elsif st.curr_tx_transaction = WRITE then 
           next_tx_state <= TX_W_BODY;
         elsif st.curr_tx_transaction = READ then
-          next_tx_state <= TX_AWAIT;
+          next_tx_state <= IDLE;
         -- Responses
         elsif st.curr_tx_transaction = READ_RESPONSE then
           next_tx_state <= TX_R_BODY;
@@ -137,7 +145,7 @@ begin
         next_tx_state <= ADDR4;
       when ADDR4 => 
         if st.curr_tx_transaction = READ_ADD then 
-          next_tx_state <= TX_AWAIT;
+          next_tx_state <= IDLE;
         elsif st.curr_tx_transaction = WRITE_ADD then 
           next_tx_state <= TX_W_BODY;
         else 
@@ -145,7 +153,7 @@ begin
         end if;
       when TX_W_BODY =>
         if st.tx_stage <= 1 then
-          next_tx_state <= TX_AWAIT;
+          next_tx_state <= IDLE;
         else 
           next_tx_state <= TX_W_BODY;
         end if;
@@ -180,12 +188,18 @@ begin
         -- Responses
         elsif st.curr_rx_transaction = READ_RESPONSE then
           next_rx_state <= RX_R_BODY;
+        elsif local_next_rx_transaction /= NO_OP then
+          next_rx_state <= RX_HEADER;
         else
           next_rx_state <= IDLE;
         end if;
       when RX_R_BODY =>
         if st.rx_stage <= 1 then
-          next_rx_state <= IDLE;
+          if local_next_rx_transaction /= NO_OP then
+            next_rx_state <= RX_HEADER;
+          else
+            next_rx_state <= IDLE;
+          end if;
         else
           next_rx_state <= RX_R_BODY;
         end if;
@@ -246,7 +260,7 @@ begin
         end if;
       when TX_R_BODY =>
         if st.tx_stage > 0 then
-          local_next_data_out := st.curr_read_data((((st.tx_stage - 1) mod 4) + 1) * 8 - 1 downto ((((st.tx_stage - 1) mod 4) + 1) - 1) * 8);
+          local_next_data_out := st.curr_read_data(next_slice_32_8_upper(st.tx_stage mod 4) downto next_slice_32_8_lower(st.tx_stage mod 4));
         end if;
       when TX_AWAIT =>
       when ADDR1 =>
@@ -311,12 +325,12 @@ begin
         trans_write_next_state <= AWAIT;
       -- Wait for driver to finish current instruction, then reenter SEND
       when AWAIT =>
-        if trans_st.write.curr_inst.seq_mem_access_count <= MAX_PKT_SIZE and st.curr_tx_state = IDLE then
+        if trans_st.write.curr_inst.seq_mem_access_count <= MAX_PKT_SIZE and not st.write_in_flight then
           trans_write_next_state <= IDLE;
         elsif ip_to_socbridge_driver.fifo.used_slots = 0 and ip_to_socbridge_driver.flush = '1'
-              and st.curr_tx_state = IDLE then
+              and not st.write_in_flight then
           trans_write_next_state <= IDLE;
-        elsif st.curr_tx_state = IDLE and (ip_to_socbridge_driver.fifo.used_slots >= MAX_PKT_SIZE
+        elsif not st.write_in_flight and (ip_to_socbridge_driver.fifo.used_slots >= MAX_PKT_SIZE
           or ip_to_socbridge_driver.flush = '1') then
           trans_write_next_state <= SEND;
         else 
@@ -348,11 +362,11 @@ begin
         trans_read_next_state <= AWAIT;
       -- Wait for driver to finish current instruction, then reenter SEND
       when AWAIT =>
-        if trans_st.read.curr_inst.seq_mem_access_count <= MAX_PKT_SIZE and st.curr_tx_state = IDLE then
+        if trans_st.read.curr_inst.seq_mem_access_count <= MAX_PKT_SIZE and not st.read_in_flight then
           trans_read_next_state <= IDLE;
-        elsif ip_to_socbridge_driver.flush = '1'and st.curr_tx_state = IDLE then
+        elsif ip_to_socbridge_driver.flush = '1'and not st.read_in_flight then
           trans_read_next_state <= IDLE;
-        elsif st.curr_tx_state = IDLE then
+        elsif not st.read_in_flight then
           trans_read_next_state <= SEND;
         else 
           trans_read_next_state <= AWAIT;
@@ -369,7 +383,8 @@ begin
         next_tx_data_size <= st.rx_data_size;
         local_next_tx_transaction := READ_RESPONSE;
       end if;
-    elsif trans_st.read.curr_state = SEND then
+    elsif trans_st.read.curr_state = SEND 
+    and not ((st.last_sent_transaction = READ or st.last_sent_transaction = READ_ADD) and trans_st.write.curr_state = SEND) then
       if trans_st.read.is_first_word = '1' then 
         local_next_tx_transaction := READ_ADD;
       else 
@@ -423,6 +438,9 @@ begin
       st.curr_write_data <= (others => '0');
       st.curr_read_data <= (others => '0');
       socbridge_driver_to_ip.data <= (others => '0');
+      st.read_in_flight  <= false;
+      st.write_in_flight <= false;
+      st.last_sent_transaction <= NO_OP;
       valid_out <= '0';
 
     elsif(rising_edge(ext_to_socbridge_driver_rec.clk)) then
@@ -437,8 +455,22 @@ begin
       valid_out <= '0';
       case st.curr_tx_state is
         when IDLE =>
-          st.curr_tx_transaction <= next_tx_transaction;   
+          if ip_to_socbridge_driver.flush = '1' then
-          st.tx_data_size <= next_tx_data_size;
+            st.last_sent_transaction <= NO_OP;
+          end if;
+          if (next_tx_transaction = WRITE or next_tx_transaction = WRITE_ADD
+          or next_tx_transaction = READ or next_tx_transaction = READ_ADD) then
+            if not st.read_in_flight or not st.write_in_flight then
+              st.curr_tx_transaction <= next_tx_transaction;   
+              st.tx_data_size <= next_tx_data_size;
+            else 
+              st.curr_tx_transaction <= NO_OP;   
+              st.tx_data_size <= 0;
+            end if;
+          else
+            st.curr_tx_transaction <= next_tx_transaction;   
+            st.tx_data_size <= next_tx_data_size;
+          end if;
           if next_tx_transaction = WRITE_ADD or next_tx_transaction = WRITE
           or next_tx_transaction = READ_RESPONSE then
             st.curr_tx_addr <= trans_st.write.curr_inst.address;
@@ -447,6 +479,18 @@ begin
             st.curr_tx_addr <= trans_st.read.curr_inst.address;
             st.tx_stage <= 0;
           end if;
+        when TX_HEADER =>
+          if st.curr_tx_transaction = WRITE or st.curr_tx_transaction = WRITE_ADD then
+            st.last_sent_transaction <= st.curr_tx_transaction;
+            if not (st.curr_rx_state = RX_HEADER and st.curr_rx_transaction = WRITE_ACK) then
+              st.write_in_flight <= true;
+            end if;
+          elsif st.curr_tx_transaction = READ or st.curr_tx_transaction = READ_ADD then
+            st.last_sent_transaction <= st.curr_tx_transaction;
+            if not (st.curr_rx_state = RX_HEADER and st.curr_rx_transaction = READ_RESPONSE) then
+              st.read_in_flight <= true;
+            end if;
+          end if;
         when TX_W_BODY =>
           if st.tx_stage > 0 then
             st.tx_stage <= st.tx_stage - 1;
@@ -468,16 +512,45 @@ begin
             st.rx_stage <= 0;
           end if;
         when RX_HEADER => 
+          if st.curr_rx_transaction = WRITE_ACK then
+            if not (st.curr_tx_state = TX_HEADER and (st.curr_tx_transaction = WRITE or st.curr_tx_transaction = WRITE_ADD)) then
+              st.write_in_flight <= false;
+            end if;
+            if next_rx_transaction /= NO_OP then
+              st.curr_rx_transaction <= next_rx_transaction;   
+              st.rx_data_size <= next_rx_data_size;
+              if next_rx_transaction = WRITE_ADD or next_rx_transaction = WRITE
+              or next_rx_transaction = READ_RESPONSE then
+                st.rx_stage <= next_rx_data_size;
+              else
+                st.rx_stage <= 0;
+              end if;
+            end if;
+          elsif st.curr_rx_transaction = READ_RESPONSE then
+            if not (st.curr_tx_state = TX_HEADER and (st.curr_tx_transaction = READ or st.curr_tx_transaction = READ_ADD)) then
+              st.read_in_flight <= false;
+            end if;
+          end if;
         when RX_R_BODY =>
           valid_out <= '1';
           socbridge_driver_to_ip.data <= st.ext_to_socbridge_driver_reg.data;
           if st.rx_stage > 0 then
             st.rx_stage <= st.rx_stage - 1;
           end if;
+          if next_rx_transaction /= NO_OP and st.rx_stage <= 1 then
+            st.curr_rx_transaction <= next_rx_transaction;   
+            st.rx_data_size <= next_rx_data_size;
+            if next_rx_transaction = WRITE_ADD or next_rx_transaction = WRITE
+            or next_rx_transaction = READ_RESPONSE then
+              st.rx_stage <= next_rx_data_size;
+            else
+              st.rx_stage <= 0;
+            end if;
+          end if;
         when RX_W_BODY =>
           if st.rx_stage > 0 then
             st.rx_stage <= st.rx_stage - 1;
-            st.curr_write_data((((st.rx_stage - 1) mod 4) + 1) * 8 - 1 downto ((((st.rx_stage - 1) mod 4) + 1)  - 1) * 8) <= st.ext_to_socbridge_driver_reg.data;
+            st.curr_write_data(next_slice_32_8_upper(st.rx_stage mod 4) downto next_slice_32_8_lower(st.rx_stage mod 4)) <= st.ext_to_socbridge_driver_reg.data;
           end if;
           if (st.rx_stage - 2) mod 4 = 0 and st.rx_data_size - st.rx_stage > 4 then
             st.curr_rx_write_addr <= std_logic_vector(to_unsigned(to_integer(unsigned(st.curr_rx_write_addr) + 4), 32));
@@ -540,7 +613,8 @@ begin
       trans_st.write.curr_state <= trans_write_next_state;
       case trans_st.write.curr_state is
         when IDLE =>
-          if controller_to_socbridge_driver.request = '1' and controller_to_socbridge_driver.instruction = WRITE then
+          if controller_to_socbridge_driver.request = '1' and controller_to_socbridge_driver.instruction = WRITE 
+             and trans_st.write.curr_inst.request = '0' then
             trans_st.write.curr_inst <= controller_to_socbridge_driver;
           else 
           end if;
@@ -560,7 +634,8 @@ begin
           end if;
           if trans_st.write.curr_inst.seq_mem_access_count mod 256 = 0 then
             trans_st.write.is_first_word <= '1';
-          elsif trans_st.read.curr_inst.instruction /= NO_OP then
+          elsif st.last_sent_transaction = READ or st.last_sent_transaction = READ_ADD 
+          or next_tx_transaction = READ or next_tx_transaction = READ_ADD then
             trans_st.write.is_first_word <= '1';
           else 
             trans_st.write.is_first_word <= '0';
@@ -575,6 +650,14 @@ begin
           end if;
           trans_st.read.is_first_word <= '1';
         when SEND =>
+          if trans_st.read.curr_inst.seq_mem_access_count mod 256 = 0 then
+            trans_st.read.is_first_word <= '1';
+          elsif st.last_sent_transaction = WRITE or st.last_sent_transaction = WRITE_ADD
+          or next_tx_transaction = WRITE or next_tx_transaction = WRITE_ADD then
+            trans_st.read.is_first_word <= '1';
+          else 
+            trans_st.read.is_first_word <= '0';
+          end if;
         when SEND_ACCEPTED => 
           trans_st.read.curr_inst.seq_mem_access_count <= trans_st.read.curr_inst.seq_mem_access_count - MAX_PKT_SIZE;
           trans_st.read.curr_inst.address <= std_logic_vector(unsigned(trans_st.read.curr_inst.address) + MAX_PKT_SIZE);
@@ -587,7 +670,8 @@ begin
           end if;
           if trans_st.read.curr_inst.seq_mem_access_count mod 256 = 0 then
             trans_st.read.is_first_word <= '1';
-          elsif trans_st.write.curr_inst.instruction /= NO_OP then
+          elsif st.last_sent_transaction = WRITE or st.last_sent_transaction = WRITE_ADD
+          or next_tx_transaction = WRITE or next_tx_transaction = WRITE_ADD then
             trans_st.read.is_first_word <= '1';
           else 
             trans_st.read.is_first_word <= '0';

src/socbridge/socbridge_driver_pkg.vhd

@@ -8,6 +8,7 @@ use gan_ganimede.io_types.all;
 
 package socbridge_driver_pkg is
   subtype command_size_t is integer range 0 to 128;
+  constant MAX_IN_FLIGHT : integer := 1;
 
   type transaction_t is
     (NO_OP, WRITE_ADD, WRITE, READ_ADD, READ, P_ERR, WRITE_ACK, READ_RESPONSE);
@@ -52,6 +53,9 @@ package socbridge_driver_pkg is
     curr_tx_addr : std_logic_vector(31 downto 0);
     curr_rx_read_addr : std_logic_vector(31 downto 0);
     curr_rx_write_addr : std_logic_vector(31 downto 0);
+    read_in_flight : boolean;
+    write_in_flight : boolean;
+    last_sent_transaction : transaction_t;
   end record state_rec_t;
   impure function calc_parity(
     d : STD_LOGIC_VECTOR(interface_inst.socbridge.payload_width - 1 downto 0)