opae build fixes

hw/opae/sources.txt

@@ -1,46 +1,34 @@
-vortex_afu.json
-
-QI:vortex_afu.qsf
-
-#+define+SCOPE
-
-#+define+DBG_PRINT_CORE_ICACHE
-#+define+DBG_PRINT_CORE_DCACHE
-#+define+DBG_PRINT_CACHE_BANK
-#+define+DBG_PRINT_CACHE_SNP
-#+define+DBG_PRINT_CACHE_MSRQ
-#+define+DBG_PRINT_DRAM
-#+define+DBG_PRINT_PIPELINE
-#+define+DBG_PRINT_OPAE
-#+define+DBG_PRINT_SCOPE
-
-+incdir+.
-+incdir+../rtl
-+incdir+../rtl/interfaces
-+incdir+../rtl/pipe_regs
-+incdir+../rtl/cache
 +incdir+../rtl/libs
-
-../rtl/VX_user_config.vh
-../rtl/VX_config.vh
-../rtl/VX_define.vh
-
-../rtl/cache/VX_cache_config.vh
-../rtl/cache/VX_cache.v
-../rtl/cache/VX_cache_core_rsp_merge.v
-../rtl/cache/VX_cache_core_req_bank_sel.v
-../rtl/cache/VX_cache_dram_req_arb.v
-../rtl/cache/VX_cache_dram_fill_arb.v
-../rtl/cache/VX_cache_miss_resrv.v
+../rtl/libs/VX_countones.v
+../rtl/libs/VX_divide.v
+../rtl/libs/VX_fair_arbiter.v
+../rtl/libs/VX_fixed_arbiter.v
+../rtl/libs/VX_generic_queue.v
+../rtl/libs/VX_generic_register.v
+../rtl/libs/VX_generic_stack.v
+../rtl/libs/VX_index_queue.v
+../rtl/libs/VX_matrix_arbiter.v
+../rtl/libs/VX_mult.v
+../rtl/libs/VX_priority_encoder.v
+../rtl/libs/VX_rr_arbiter.v
+../rtl/libs/VX_onehot_encooder.v
++incdir+../rtl/cache
 ../rtl/cache/VX_bank.v
 ../rtl/cache/VX_bank_core_req_arb.v
+../rtl/cache/VX_cache.v
+../rtl/cache/VX_cache_core_req_bank_sel.v
+../rtl/cache/VX_cache_core_rsp_merge.v
+../rtl/cache/VX_cache_dram_fill_arb.v
+../rtl/cache/VX_cache_dram_req_arb.v
+../rtl/cache/VX_cache_miss_resrv.v
+../rtl/cache/VX_prefetcher.v
+../rtl/cache/VX_snp_forwarder.v
 ../rtl/cache/VX_snp_rsp_arb.v
 ../rtl/cache/VX_tag_data_access.v
 ../rtl/cache/VX_tag_data_structure.v
-../rtl/cache/VX_snp_forwarder.v
-../rtl/cache/VX_prefetcher.v
-
-../rtl/interfaces/VX_branch_rsp_if.v
++incdir+../rtl/interfaces
+../rtl/interfaces/VX_alu_req_if.v
+../rtl/interfaces/VX_branch_ctl_if.v
 ../rtl/interfaces/VX_cache_core_req_if.v
 ../rtl/interfaces/VX_cache_core_rsp_if.v
 ../rtl/interfaces/VX_cache_dram_req_if.v
@@ -48,65 +36,46 @@ QI:vortex_afu.qsf
 ../rtl/interfaces/VX_cache_snp_req_if.v
 ../rtl/interfaces/VX_cache_snp_rsp_if.v
 ../rtl/interfaces/VX_csr_req_if.v
+../rtl/interfaces/VX_commit_if.v
 ../rtl/interfaces/VX_csr_io_req_if.v
-../rtl/interfaces/VX_csr_io_rsp_if.v
-../rtl/interfaces/VX_exec_unit_req_if.v
-../rtl/interfaces/VX_backend_req_if.v
-../rtl/interfaces/VX_gpr_read_if.v
-../rtl/interfaces/VX_gpu_inst_req_if.v
-../rtl/interfaces/VX_inst_meta_if.v
-../rtl/interfaces/VX_jal_rsp_if.v
+../rtl/interfaces/VX_decode_if.v
+../rtl/interfaces/VX_gpr_data_if.v
+../rtl/interfaces/VX_gpu_req_if.v
 ../rtl/interfaces/VX_join_if.v
 ../rtl/interfaces/VX_lsu_req_if.v
 ../rtl/interfaces/VX_warp_ctl_if.v
 ../rtl/interfaces/VX_wb_if.v
 ../rtl/interfaces/VX_wstall_if.v
-
-../rtl/libs/VX_generic_register.v
-../rtl/libs/VX_mult.v
-../rtl/libs/VX_divide.v
-../rtl/libs/VX_generic_stack.v
-../rtl/libs/VX_priority_encoder.v
-../rtl/libs/VX_generic_queue.v
-../rtl/libs/VX_indexable_queue.v
-../rtl/libs/VX_fair_arbiter.v
-../rtl/libs/VX_fixed_arbiter.v
-../rtl/libs/VX_rr_arbiter.v
-../rtl/libs/VX_countones.v
-../rtl/libs/VX_scope.v
-
-../rtl/Vortex.v
+../rtl/interfaces/VX_csr_io_rsp_if.v
+../rtl/interfaces/VX_ifetch_req_if.v
+../rtl/interfaces/VX_ifetch_rsp_if.v
+../rtl/interfaces/VX_mul_req_if.v
+../rtl/interfaces/VX_perf_cntrs_if.v
++incdir+../rtl
+../rtl/VX_alu_unit.v
+../rtl/VX_commit.v
 ../rtl/VX_cluster.v
 ../rtl/VX_core.v
-../rtl/VX_mem_unit.v
-../rtl/VX_pipeline.v
-../rtl/VX_front_end.v
-../rtl/VX_back_end.v
-../rtl/VX_fetch.v
-../rtl/VX_scheduler.v
-../rtl/VX_exec_unit.v
-../rtl/VX_warp.v
-../rtl/VX_icache_stage.v
-../rtl/VX_gpr_wrapper.v
-../rtl/VX_gpu_inst.v
-../rtl/VX_writeback.v
-../rtl/VX_csr_pipe.v
 ../rtl/VX_csr_data.v
 ../rtl/VX_csr_arb.v
+../rtl/VX_dcache_arb.v
+../rtl/VX_decode.v
 ../rtl/VX_csr_io_arb.v
-../rtl/VX_warp_sched.v
+../rtl/VX_fetch.v
+../rtl/VX_csr_unit.v
 ../rtl/VX_gpr_ram.v
 ../rtl/VX_gpr_stage.v
-../rtl/VX_alu_unit.v
+../rtl/VX_execute.v
+../rtl/VX_gpu_unit.v
+../rtl/VX_icache_stage.v
+../rtl/VX_issue.v
 ../rtl/VX_lsu_unit.v
-../rtl/VX_decode.v
-../rtl/VX_inst_multiplex.v
-../rtl/VX_dcache_arb.v
 ../rtl/VX_mem_arb.v
-../rtl/VX_f_d_reg.v
-../rtl/VX_i_d_reg.v
-../rtl/VX_d_e_reg.v
-
-ccip_interface_reg.sv
-ccip_std_afu.sv
-vortex_afu.sv
+../rtl/VX_mem_unit.v
+../rtl/VX_pipeline.v
+../rtl/VX_scheduler.v
+../rtl/VX_issue_mux.v
+../rtl/VX_warp_sched.v
+../rtl/VX_writeback.v
+../rtl/Vortex.v
+../rtl/VX_mul_unit.v