wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed Vortex_SOC to Vortex_Socket

Browse Source
This commit is contained in:
Blaise Tine
2020-04-14 08:33:32 -04:00
parent c132149801
commit 22c8da7490
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hw/Makefile
View File

@@ -4,7 +4,7 @@ INCLUDE = -I. -Ishared_memory -Icache -IVX_cache -IVX_cache/interfaces -Iinterfa
SINGLE_CORE = Vortex.v SINGLE_CORE = Vortex.v
MULTI_CORE = Vortex_SOC.v MULTI_CORE = Vortex_Socket.v
EXE += --exe ./simulate/test_bench.cpp ./simulate/simulator.cpp EXE += --exe ./simulate/test_bench.cpp ./simulate/simulator.cpp
@@ -27,7 +27,7 @@ MAKECPP += (cd obj_dir && make -j -f VVortex.mk OPT='-DVL_DEBUG' VL_DEBUG=1 DVL_
MAKECPPRel += (cd obj_dir && make -j -f VVortex.mk) MAKECPPRel += (cd obj_dir && make -j -f VVortex.mk)
MAKEMULTICPP += (cd obj_dir && make -j -f VVortex_SOC.mk OPT='-DVL_DEBUG' VL_DEBUG=1 DVL_DEBUG=1) MAKEMULTICPP += (cd obj_dir && make -j -f VVortex_Socket.mk OPT='-DVL_DEBUG' VL_DEBUG=1 DVL_DEBUG=1)
THREADS ?= $(shell python3 -c 'import multiprocessing as mp; print(max(1, mp.cpu_count() // 2))') THREADS ?= $(shell python3 -c 'import multiprocessing as mp; print(max(1, mp.cpu_count() // 2))')
@@ -76,7 +76,7 @@ run: w
(cd obj_dir && ./VVortex) (cd obj_dir && ./VVortex)
run-multicore: multicore run-multicore: multicore
(cd obj_dir && ./VVortex_SOC) (cd obj_dir && ./VVortex_Socket)
runRel: wRel runRel: wRel
(cd obj_dir && ./VVortex) (cd obj_dir && ./VVortex)

2
hw/opae/sources.txt
View File

@@ -14,7 +14,7 @@ vortex_afu.json
../../rtl/VX_define_synth.v ../../rtl/VX_define_synth.v
../../rtl/VX_define.v ../../rtl/VX_define.v
../../rtl/VX_cache/VX_cache_config.v ../../rtl/VX_cache/VX_cache_config.v
../../rtl/Vortex_SOC.v ../../rtl/Vortex_Socket.v
../../rtl/Vortex_Cluster.v ../../rtl/Vortex_Cluster.v
../../rtl/Vortex.v ../../rtl/Vortex.v
../../rtl/VX_front_end.v ../../rtl/VX_front_end.v

2
hw/opae/vortex_afu.sv
View File

@@ -547,7 +547,7 @@ end
// Vortex binding ///////////////////////////////////////////////////////////// // Vortex binding /////////////////////////////////////////////////////////////
Vortex_SOC #() vx_soc ( Vortex_Socket #() vx_socket (
.clk (clk), .clk (clk),
.reset (SoftReset || vx_reset), .reset (SoftReset || vx_reset),

2
hw/rtl/Vortex_SOC.v → hw/rtl/Vortex_Socket.v
View File

@@ -1,7 +1,7 @@
`include "VX_define.v" `include "VX_define.v"
`include "VX_cache_config.v" `include "VX_cache_config.v"
module Vortex_SOC ( module Vortex_Socket (
// Clock // Clock
input wire clk, input wire clk,

2
hw/syn/quartus/top/Makefile
View File

@@ -1,5 +1,5 @@
PROJECT = Vortex PROJECT = Vortex
TOP_LEVEL_ENTITY = Vortex_SOC TOP_LEVEL_ENTITY = Vortex_Socket
SRC_FILE = ../Vortex.v SRC_FILE = ../Vortex.v
PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf

2
hw/verilator/simulator.cpp
View File

@@ -9,7 +9,7 @@ Simulator::Simulator(RAM *ram)
ram_ = ram; ram_ = ram;
#ifdef USE_MULTICORE #ifdef USE_MULTICORE
vortex_ = new VVortex_SOC(); vortex_ = new VVortex_Socket();
#else #else
vortex_ = new VVortex(); vortex_ = new VVortex();
#endif #endif

6
hw/verilator/simulator.h
View File

@@ -1,8 +1,8 @@
#pragma once #pragma once
#ifdef USE_MULTICORE #ifdef USE_MULTICORE
#include "VVortex_SOC.h" #include "VVortex_Socket.h"
#include "VVortex_SOC__Syms.h" #include "VVortex_Socket__Syms.h"
#else #else
#include "VVortex.h" #include "VVortex.h"
#include "VVortex__Syms.h" #include "VVortex__Syms.h"
@@ -63,7 +63,7 @@ private:
std::vector<dram_req_t> I_dram_req_vec_; std::vector<dram_req_t> I_dram_req_vec_;
RAM *ram_; RAM *ram_;
#ifdef USE_MULTICORE #ifdef USE_MULTICORE
VVortex_SOC *vortex_; VVortex_Socket *vortex_;
#else #else
VVortex *vortex_; VVortex *vortex_;
#endif #endif

2
sw/driver/rtlsim/Makefile
View File

@@ -14,7 +14,7 @@ LDFLAGS += -shared -pthread
ifdef USE_MULTICORE ifdef USE_MULTICORE
CFLAGS += -DUSE_MULTICORE CFLAGS += -DUSE_MULTICORE
RTL_TOP = Vortex_SOC RTL_TOP = Vortex_Socket
else else
VL_FLAGS += -DSINGLE_CORE_BENCH VL_FLAGS += -DSINGLE_CORE_BENCH
RTL_TOP = Vortex RTL_TOP = Vortex