Vortex 2.0 changes:

+ Microarchitecture optimizations
+ 64-bit support
+ Xilinx FPGA support
+ LLVM-16 support
+ Refactoring and quality control fixes

hw/rtl/VX_scope.vh

@@ -1,89 +1,68 @@
-`ifndef VX_SCOPE
-`define VX_SCOPE
+// Copyright © 2019-2023
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+`ifndef VX_SCOPE_VH
+`define VX_SCOPE_VH
 
 `ifdef SCOPE
 
-`include "scope-defs.vh"
+`define SCOPE_IO_DECL \
+    input wire scope_reset, \
+    input wire scope_bus_in, \
+    output wire scope_bus_out,
 
-`define SCOPE_ASSIGN(d,s) assign scope_``d = s
+`define SCOPE_IO_SWITCH(__count) \
+    wire scope_bus_in_w [__count]; \
+    wire scope_bus_out_w [__count]; \
+    `RESET_RELAY_EX(scope_reset_w, scope_reset, __count, 4); \
+    VX_scope_switch #( \
+        .N (__count) \
+    ) scope_switch ( \
+        .clk (clk), \
+        .reset (scope_reset), \
+        .req_in (scope_bus_in), \
+        .rsp_out (scope_bus_out), \
+        .req_out (scope_bus_in_w), \
+        .rsp_in (scope_bus_out_w) \
+    );
 
-`define SCOPE_SIZE 1024
+`define SCOPE_IO_BIND(__i) \
+    .scope_reset (scope_reset_w[__i]), \
+    .scope_bus_in (scope_bus_in_w[__i]), \
+    .scope_bus_out (scope_bus_out_w[__i]),
+
+`define SCOPE_IO_UNUSED() \
+    `UNUSED_VAR (scope_reset); \
+    `UNUSED_VAR (scope_bus_in); \
+    assign scope_bus_out = 0;
+
+`define SCOPE_IO_UNUSED_W(__i) \
+    `UNUSED_VAR (scope_reset_w[__i]); \
+    `UNUSED_VAR (scope_bus_in_w[__i]); \
+    assign scope_bus_out_w[__i] = 0;
 
 `else
 
-`define SCOPE_IO_VX_icache_stage
+`define SCOPE_IO_DECL
 
-`define SCOPE_IO_VX_fetch
+`define SCOPE_IO_SWITCH(__count)
 
-`define SCOPE_BIND_VX_fetch_icache_stage
+`define SCOPE_IO_BIND(__i)
 
-`define SCOPE_BIND_VX_fetch_warp_sched
+`define SCOPE_IO_UNUSED_W(__i)
 
-`define SCOPE_IO_VX_warp_sched
-
-`define SCOPE_IO_VX_pipeline
-
-`define SCOPE_BIND_VX_pipeline_fetch
-
-`define SCOPE_IO_VX_core
-
-`define SCOPE_BIND_VX_core_pipeline
-
-`define SCOPE_IO_VX_cluster
-
-`define SCOPE_BIND_VX_cluster_core(__i__)
-
-`define SCOPE_IO_Vortex
-
-`define SCOPE_BIND_Vortex_cluster(__i__)
-
-`define SCOPE_BIND_afu_vortex
-
-`define SCOPE_IO_VX_lsu_unit
-
-`define SCOPE_IO_VX_gpu_unit
-
-`define SCOPE_IO_VX_execute
-
-`define SCOPE_BIND_VX_execute_lsu_unit
-
-`define SCOPE_BIND_VX_execute_gpu_unit
-
-`define SCOPE_BIND_VX_pipeline_execute
-
-`define SCOPE_IO_VX_issue
-
-`define SCOPE_BIND_VX_pipeline_issue
-
-`define SCOPE_IO_VX_bank
-
-`define SCOPE_IO_VX_cache
-
-`define SCOPE_BIND_VX_cache_bank(__i__)
-
-`define SCOPE_BIND_Vortex_l3cache
-
-`define SCOPE_BIND_VX_cluster_l2cache
-
-`define SCOPE_IO_VX_mem_unit
-
-`define SCOPE_BIND_VX_mem_unit_dcache
-
-`define SCOPE_BIND_VX_core_mem_unit
-
-`define SCOPE_BIND_VX_mem_unit_icache
-
-`define SCOPE_BIND_VX_mem_unit_smem
-
-`define SCOPE_DECL_SIGNALS
-
-`define SCOPE_DATA_LIST
-
-`define SCOPE_UPDATE_LIST
-
-`define SCOPE_TRIGGER
-
-`define SCOPE_ASSIGN(d,s)
+`define SCOPE_IO_UNUSED(__i)
 
 `endif
-`endif
+
+`endif // VX_SCOPE_VH