From 5d4bad80a21423be0f30b245d3e4e868ceb36c9f Mon Sep 17 00:00:00 2001
From: Byron Lathi <bslathi19@gmail.com>
Date: Thu, 16 Nov 2023 08:12:45 -0800
Subject: [PATCH] Fix level triggered test, add to ci

---
 .gitlab-ci.yml                                | 17 +++++-
 .../simulation/tbs/interrupt_controller_tb.sv | 58 ++++++++++++++++++-
 hw/efinix_fpga/src/interrupt_controller.sv    |  2 +-
 3 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 826d87d..eb2c7fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,4 +145,19 @@ mapper_code sim:
     - cd hw/efinix_fpga/simulation
     - make clean
     - TEST_PROGRAM_NAME=mapper_test make mapper_code_tb
-    - ./mapper_code_tb
\ No newline at end of file
+    - ./mapper_code_tb
+
+interrupt_controller sim:
+  tags:
+    - linux
+    - iverilog
+  stage: simulate
+  artifacts:
+    paths:
+      - hw/efinix_fpga/simulation/interrupt_controller.vcd
+  script:
+    - source init_env.sh
+    - cd hw/efinix_fpga/simulation
+    - make clean
+    - TEST_PROGRAM_NAME=mapper_test make interrupt_controller_tb
+    - ./interrupt_controller_tb
\ No newline at end of file
diff --git a/hw/efinix_fpga/simulation/tbs/interrupt_controller_tb.sv b/hw/efinix_fpga/simulation/tbs/interrupt_controller_tb.sv
index 08812e1..3276027 100644
--- a/hw/efinix_fpga/simulation/tbs/interrupt_controller_tb.sv
+++ b/hw/efinix_fpga/simulation/tbs/interrupt_controller_tb.sv
@@ -66,6 +66,7 @@ endtask
  */
  // TODO this needs to test that it does not trigger after we clear the irq.
 task test_edge_irq();
+    $display("Testing Edge IRQ");
     repeat (5) @(posedge r_clk_cpu);
     reset = 1;
     cs = 0;
@@ -84,6 +85,7 @@ task test_edge_irq();
     int_in = 1;
     @(posedge r_clk_cpu)
     assert (int_out == 1) else begin
+        errors = errors + 1;
         $error("Interrupt should be high!");
     end
     repeat (5) @(posedge r_clk_cpu);
@@ -91,18 +93,72 @@ task test_edge_irq();
     write_reg(1, 8'h01);
     @(posedge r_clk_cpu);
     assert (int_out == 0) else begin
+        errors = errors + 1;
         $error("Interrupt should be low!");
     end
     int_in = 0;
     repeat (5) @(posedge r_clk_cpu);
+    write_reg(0, 8'hff);
+    write_reg(1, 8'h01);
     assert (int_out == 0) else begin
+        errors = errors + 1;
         $error("Interrupt should be low!");
     end
 endtask
 
+task test_level_irq();
+    $display("Testing level IRQ");
+    repeat (5) @(posedge r_clk_cpu);
+    reset = 1;
+    cs = 0;
+    rwb = 1;
+    addr = '0;
+    i_data = '0;
+    int_in = '0;
+    repeat (5) @(posedge r_clk_cpu);
+    reset = 0;
+    repeat (5) @(posedge r_clk_cpu);
+    write_reg(0, 8'h10);    // Enable register
+    write_reg(1, 8'hff);    // 0-7 all enabled
+    write_reg(0, 8'h20);    // Type register
+    write_reg(1, 8'hff);    // 0-7 all level triggered?
+    repeat (5) @(posedge r_clk_cpu);
+    int_in = 1;
+    @(posedge r_clk_cpu)
+    assert (int_out == 1) else begin
+        errors = errors + 1;
+        $error("Interrupt should be high!");
+    end
+    repeat (5) @(posedge r_clk_cpu);
+    write_reg(0, 8'hff);
+    write_reg(1, 8'h01);
+    @(posedge r_clk_cpu);
+    assert (int_out == 1) else begin
+        errors = errors + 1;
+        $error("Interrupt should be high!");
+    end
+    int_in = 0;
+    repeat (5) @(posedge r_clk_cpu);
+    write_reg(0, 8'hff);
+    write_reg(1, 8'h01);
+    @(posedge r_clk_cpu);
+    repeat (5) @(posedge r_clk_cpu)
+    assert (int_out == 0) else begin
+        errors = errors + 1;
+        $error("Interrupt should be low!");
+    end
+endtask
+
+int errors;
+
 initial begin
+    errors = 0;
     test_edge_irq();
-    $finish();
+    test_level_irq();
+    if (errors > 0)
+        $finish_and_return(-1);
+    else
+        $finish();
 end
 
 initial
diff --git a/hw/efinix_fpga/src/interrupt_controller.sv b/hw/efinix_fpga/src/interrupt_controller.sv
index 25b7f82..eee3aff 100644
--- a/hw/efinix_fpga/src/interrupt_controller.sv
+++ b/hw/efinix_fpga/src/interrupt_controller.sv
@@ -128,7 +128,7 @@ always_comb begin
                 if (w_eoi && i == irq_val) begin
                     r_int_next[i] = int_masked[i];
                 end else begin
-                    r_int_next[i] = r_int[i];
+                    r_int_next[i] = r_int[i] | int_masked[i];
                 end
             end
         endcase