renamed Vortex_SOC to Vortex_Socket

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

View File

@@ -4,7 +4,7 @@ INCLUDE = -I. -Ishared_memory -Icache -IVX_cache -IVX_cache/interfaces -Iinterfa
SINGLE_CORE = Vortex.v
MULTI_CORE = Vortex_SOC.v
MULTI_CORE = Vortex_Socket.v
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)
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))')
@@ -76,7 +76,7 @@ run: w
(cd obj_dir && ./VVortex)
run-multicore: multicore
(cd obj_dir && ./VVortex_SOC)
(cd obj_dir && ./VVortex_Socket)
runRel: wRel
(cd obj_dir && ./VVortex)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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