Version 1.5.0. Recor type in signals/ports supported

Author: mikhailmoiseev

build.sh

@@ -23,10 +23,10 @@ cd $CWD_DIR
 
     cd ..
 
-    mkdir build_icsc_dbg -p && cd build_icsc_dbg
-    cmake ../ -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_INSTALL_PREFIX=$ICSC_HOME -DCMAKE_CXX_STANDARD=17 -DCMAKE_DEBUG_POSTFIX=d
-    make -j12
-    make install
+#    mkdir build_icsc_dbg -p && cd build_icsc_dbg
+#    cmake ../ -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_INSTALL_PREFIX=$ICSC_HOME -DCMAKE_CXX_STANDARD=17 -DCMAKE_DEBUG_POSTFIX=d
+#    make -j12
+#    make install
 
     cp $CWD_DIR/cmake/CMakeLists.top $ICSC_HOME/CMakeLists.txt
 )

designs/tests/cthread/cthread_const_prop.sv

@@ -1,6 +1,6 @@
 //==============================================================================
 //
-// The code is generated by Intel Compiler for SystemC, version 1.4.15
+// The code is generated by Intel Compiler for SystemC, version 1.4.39
 // see more information at https://github.com/intel/systemc-compiler
 //
 //==============================================================================
@@ -51,6 +51,7 @@ module A // "b_mod.a_mod"
 logic [1:0] rr_first_indx;
 
 // Local parameters generated for C++ constants
+localparam logic signed [31:0] ci = 42;
 localparam logic [31:0] PORT_NUM = 2;
 localparam logic [31:0] FIFO_LENGTH = 2;
 localparam logic [63:0] p = 0;

designs/tests/cthread/cthread_reset.sv

@@ -1,6 +1,6 @@
 //==============================================================================
 //
-// The code is generated by Intel Compiler for SystemC, version 1.4.37
+// The code is generated by Intel Compiler for SystemC, version 1.4.39
 // see more information at https://github.com/intel/systemc-compiler
 //
 //==============================================================================
@@ -48,7 +48,7 @@ begin : sct_assert_test_ff
         c <= 0;
 
     `ifndef INTEL_SVA_OFF
-        sctAssertLine99 : assert property ( a |=> c_next );
+        sctAssertLine99r : assert property ( a |=> c_next );
     `endif // INTEL_SVA_OFF
     end
     else begin

designs/tests/method/CMakeLists.txt

@@ -68,6 +68,9 @@ svc_target(method_const_liter_compound GOLDEN method_const_liter_compound.sv)
 add_executable(method_string_liter test_string_liter.cpp)
 svc_target(method_string_liter GOLDEN method_string_liter.sv)
 
+add_executable(method_liter_width test_liter_width.cpp)
+svc_target(method_liter_width GOLDEN method_liter_width.sv)
+
 add_executable(method_const_binary test_const_binary.cpp)
 svc_target(method_const_binary GOLDEN method_const_binary.sv)
 
@@ -240,8 +243,8 @@ svc_target(method_explicit_type_conv GOLDEN method_explicit_type_conv.sv)
 add_executable(method_unary test_unary.cpp)
 svc_target(method_unary GOLDEN method_unary.sv)
 
-#add_executable(method_unary_sc test_unary_sc.cpp)
-#svc_target(method_unary_sc GOLDEN method_unary_sc.sv)
+add_executable(method_unary_sc test_unary_sc.cpp)
+svc_target(method_unary_sc GOLDEN method_unary_sc.sv)
 
 # Arrays
 
@@ -401,3 +404,7 @@ svc_target(method_bit_range_fail WILL_FAIL)
 
 add_executable(method_unsupport_types_fail test_unsupport_types_fail.cpp)
 svc_target(method_unsupport_types_fail WILL_FAIL)
+
+## Not supported yet, see #304
+#add_executable(method_clock_sensitive test_clock_sensitive.cpp)
+#svc_target(method_clock_sensitive GOLDEN method_clock_sensitive.sv)

designs/tests/method/method_bool.sv

@@ -1,6 +1,6 @@
 //==============================================================================
 //
-// The code is generated by Intel Compiler for SystemC, version 1.4.16
+// The code is generated by Intel Compiler for SystemC, version 1.4.53
 // see more information at https://github.com/intel/systemc-compiler
 //
 //==============================================================================

designs/tests/method/method_clock_sensitive.sv

@@ -0,0 +1,49 @@
+//==============================================================================
+//
+// The code is generated by Intel Compiler for SystemC, version 1.4.43
+// see more information at https://github.com/intel/systemc-compiler
+//
+//==============================================================================
+
+//==============================================================================
+//
+// Module: A ()
+//
+module A // "a"
+(
+    input logic clk,
+    input logic nrst
+);
+
+// Variables generated for SystemC signals
+logic signed [31:0] a;
+
+//------------------------------------------------------------------------------
+// Clocked THREAD: meth1 (test_clock_sensitive.cpp:26:5) 
+
+// Thread-local variables
+logic signed [31:0] a_next;
+
+// Next-state combinational logic
+always_comb begin : meth1_comb     // test_clock_sensitive.cpp:26:5
+    meth1_func;
+end
+function void meth1_func;
+    a_next = a;
+    a_next = 1;
+endfunction
+
+// Synchronous register update
+always_ff @(posedge clk or negedge nrst) 
+begin : meth1_ff
+    if ( ~nrst ) begin
+        a <= 0;
+    end
+    else begin
+        a <= a_next;
+    end
+end
+
+endmodule
+
+

designs/tests/method/method_fcall.sv

@@ -1,6 +1,6 @@
 //==============================================================================
 //
-// The code is generated by Intel Compiler for SystemC, version 1.4.23
+// The code is generated by Intel Compiler for SystemC, version 1.4.44
 // see more information at https://github.com/intel/systemc-compiler
 //
 //==============================================================================
@@ -29,10 +29,10 @@ assign s1[0] = struct_c_out_port;
 assign s1[1] = struct_c2_out_port;
 
 //------------------------------------------------------------------------------
-// Method process: std_funcs (test_fcall.cpp:431:5) 
+// Method process: std_funcs (test_fcall.cpp:432:5) 
 
 always_comb 
-begin : std_funcs     // test_fcall.cpp:431:5
+begin : std_funcs     // test_fcall.cpp:432:5
     integer unsigned a_1;
     a_1 = 2;
 end
@@ -101,27 +101,29 @@ end
 always_comb 
 begin : port_access_call     // test_fcall.cpp:299:5
     logic b1;
+    integer i;
     logic TMP_0;
     logic [1:0] val;
+    i = s1[1];
     // Call f6() begin
     b = !a;
     // Call f6() end
     // Call f7() begin
     c = a;
     TMP_0 = !a;
     // Call f7() end
-    b1 = TMP_0;
+    b1 = |(TMP_0 + i);
     val = 3;
     // Call f3() begin
     struct_c_out_port = val;
     // Call f3() end
 end
 
 //------------------------------------------------------------------------------
-// Method process: included_func_calls (test_fcall.cpp:311:5) 
+// Method process: included_func_calls (test_fcall.cpp:312:5) 
 
 always_comb 
-begin : included_func_calls     // test_fcall.cpp:311:5
+begin : included_func_calls     // test_fcall.cpp:312:5
     logic [3:0] TMP_0;
     logic [2:0] val;
     logic TMP_3;
@@ -155,10 +157,10 @@ begin : included_func_calls     // test_fcall.cpp:311:5
 end
 
 //------------------------------------------------------------------------------
-// Method process: multiple_returns (test_fcall.cpp:320:5) 
+// Method process: multiple_returns (test_fcall.cpp:321:5) 
 
 always_comb 
-begin : multiple_returns     // test_fcall.cpp:320:5
+begin : multiple_returns     // test_fcall.cpp:321:5
     integer j;
     integer m_1;
     j = 1;
@@ -169,10 +171,10 @@ begin : multiple_returns     // test_fcall.cpp:320:5
 end
 
 //------------------------------------------------------------------------------
-// Method process: return_in_loop (test_fcall.cpp:330:5) 
+// Method process: return_in_loop (test_fcall.cpp:331:5) 
 
 always_comb 
-begin : return_in_loop     // test_fcall.cpp:330:5
+begin : return_in_loop     // test_fcall.cpp:331:5
     integer unsigned TMP_0;
     integer unsigned val;
     integer j;
@@ -223,10 +225,10 @@ begin : static_func_call     // test_fcall.cpp:246:5
 end
 
 //------------------------------------------------------------------------------
-// Method process: included_funcs1 (test_fcall.cpp:356:5) 
+// Method process: included_funcs1 (test_fcall.cpp:357:5) 
 
 always_comb 
-begin : included_funcs1     // test_fcall.cpp:356:5
+begin : included_funcs1     // test_fcall.cpp:357:5
     integer k_1;
     integer k_2;
     integer k_3;
@@ -243,10 +245,10 @@ begin : included_funcs1     // test_fcall.cpp:356:5
 end
 
 //------------------------------------------------------------------------------
-// Method process: included_funcs2 (test_fcall.cpp:365:5) 
+// Method process: included_funcs2 (test_fcall.cpp:366:5) 
 
 always_comb 
-begin : included_funcs2     // test_fcall.cpp:365:5
+begin : included_funcs2     // test_fcall.cpp:366:5
     integer k_1;
     integer k_2;
     integer k_3;
@@ -271,19 +273,19 @@ begin : included_funcs2     // test_fcall.cpp:365:5
 end
 
 //------------------------------------------------------------------------------
-// Method process: func_double_used (test_fcall.cpp:376:5) 
+// Method process: func_double_used (test_fcall.cpp:377:5) 
 
 always_comb 
-begin : func_double_used     // test_fcall.cpp:376:5
+begin : func_double_used     // test_fcall.cpp:377:5
     logic b_1;
     b_1 = 0;
 end
 
 //------------------------------------------------------------------------------
-// Method process: func_chan_pointer (test_fcall.cpp:393:5) 
+// Method process: func_chan_pointer (test_fcall.cpp:394:5) 
 
 always_comb 
-begin : func_chan_pointer     // test_fcall.cpp:393:5
+begin : func_chan_pointer     // test_fcall.cpp:394:5
     integer j;
     integer TMP_0;
     integer i;
@@ -316,22 +318,22 @@ begin : func_chan_pointer     // test_fcall.cpp:393:5
 end
 
 //------------------------------------------------------------------------------
-// Method process: func_var_pointer (test_fcall.cpp:416:5) 
+// Method process: func_var_pointer (test_fcall.cpp:417:5) 
 
 // Process-local variables
 logic [2:0] s;
 
 always_comb 
-begin : func_var_pointer     // test_fcall.cpp:416:5
+begin : func_var_pointer     // test_fcall.cpp:417:5
     integer j;
     j = 0;    // Call of f_ptr()
 end
 
 //------------------------------------------------------------------------------
-// Method process: special_funcs (test_fcall.cpp:423:5) 
+// Method process: special_funcs (test_fcall.cpp:424:5) 
 
 always_comb 
-begin : special_funcs     // test_fcall.cpp:423:5
+begin : special_funcs     // test_fcall.cpp:424:5
     integer y;
     y = 0;
 end

designs/tests/method/method_liter_width.sv

@@ -0,0 +1,78 @@
+//==============================================================================
+//
+// The code is generated by Intel Compiler for SystemC, version 1.4.52
+// see more information at https://github.com/intel/systemc-compiler
+//
+//==============================================================================
+
+//==============================================================================
+//
+// Module: A ()
+//
+module A // "a"
+(
+    input logic clk
+);
+
+// Variables generated for SystemC signals
+logic nrst;
+logic [15:0] s;
+
+//------------------------------------------------------------------------------
+// Method process: checkWidthProc (test_liter_width.cpp:31:5) 
+
+// Process-local variables
+logic [2:0] k;
+
+always_comb 
+begin : checkWidthProc     // test_liter_width.cpp:31:5
+    if (|s)
+    begin
+        k = 1;
+    end else begin
+        k = 3'd1;
+    end
+    if (|s)
+    begin
+        k = 23'd1;
+    end else begin
+        k = 2'd1;
+    end
+end
+
+//------------------------------------------------------------------------------
+// Clocked THREAD: concatProc (test_liter_width.cpp:49:5) 
+
+// Thread-local variables
+logic [2:0] j;
+logic [2:0] j_next;
+logic [2:0] i;
+logic [2:0] i_next;
+
+// Next-state combinational logic
+always_comb begin : concatProc_comb     // test_liter_width.cpp:49:5
+    concatProc_func;
+end
+function void concatProc_func;
+    logic [30:0] t;
+    i_next = i;
+    j_next = j;
+    t = {j_next, i_next};
+endfunction
+
+// Synchronous register update
+always_ff @(posedge clk or negedge nrst) 
+begin : concatProc_ff
+    if ( ~nrst ) begin
+        j <= 1;
+        i <= 1;
+    end
+    else begin
+        j <= j_next;
+        i <= i_next;
+    end
+end
+
+endmodule
+
+

designs/tests/method/method_unary.sv

@@ -1,6 +1,6 @@
 //==============================================================================
 //
-// The code is generated by Intel Compiler for SystemC, version 1.4.16
+// The code is generated by Intel Compiler for SystemC, version 1.4.53
 // see more information at https://github.com/intel/systemc-compiler
 //
 //==============================================================================

designs/tests/method/method_var.sv

@@ -1,6 +1,6 @@
 //==============================================================================
 //
-// The code is generated by Intel Compiler for SystemC, version 1.4.23
+// The code is generated by Intel Compiler for SystemC, version 1.4.39
 // see more information at https://github.com/intel/systemc-compiler
 //
 //==============================================================================
@@ -64,6 +64,7 @@ logic signed [31:0] sig;
 
 // Local parameters generated for C++ constants
 localparam logic signed [31:0] m = 11;
+localparam logic signed [31:0] ci = 42;
 
 //------------------------------------------------------------------------------
 // Method process: unknown_ref (test_var.cpp:78:5)