From 22c8da749072adf0108a466f64a59418b463b82e Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@yahoo.com>
Date: Tue, 14 Apr 2020 08:33:32 -0400
Subject: [PATCH] renamed Vortex_SOC to Vortex_Socket

---
 hw/Makefile                              | 6 +++---
 hw/opae/sources.txt                      | 2 +-
 hw/opae/vortex_afu.sv                    | 2 +-
 hw/rtl/{Vortex_SOC.v => Vortex_Socket.v} | 2 +-
 hw/syn/quartus/top/Makefile              | 2 +-
 hw/verilator/simulator.cpp               | 2 +-
 hw/verilator/simulator.h                 | 6 +++---
 sw/driver/rtlsim/Makefile                | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename hw/rtl/{Vortex_SOC.v => Vortex_Socket.v} (99%)

diff --git a/hw/Makefile b/hw/Makefile
index 99000f9b..f4556bc6 100644
--- a/hw/Makefile
+++ b/hw/Makefile
@@ -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)
diff --git a/hw/opae/sources.txt b/hw/opae/sources.txt
index 26201f2d..f90d5d63 100644
--- a/hw/opae/sources.txt
+++ b/hw/opae/sources.txt
@@ -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
diff --git a/hw/opae/vortex_afu.sv b/hw/opae/vortex_afu.sv
index f915bc5f..c997fc57 100644
--- a/hw/opae/vortex_afu.sv
+++ b/hw/opae/vortex_afu.sv
@@ -547,7 +547,7 @@ end
 
 // Vortex binding /////////////////////////////////////////////////////////////
 
-Vortex_SOC #() vx_soc (
+Vortex_Socket #() vx_socket (
   .clk                    (clk),
   .reset                  (SoftReset || vx_reset),
 
diff --git a/hw/rtl/Vortex_SOC.v b/hw/rtl/Vortex_Socket.v
similarity index 99%
rename from hw/rtl/Vortex_SOC.v
rename to hw/rtl/Vortex_Socket.v
index 7dc5e6de..e58fd2c7 100644
--- a/hw/rtl/Vortex_SOC.v
+++ b/hw/rtl/Vortex_Socket.v
@@ -1,7 +1,7 @@
 `include "VX_define.v"
 `include "VX_cache_config.v"
 
-module Vortex_SOC (
+module Vortex_Socket (
 
     // Clock
     input  wire             clk,
diff --git a/hw/syn/quartus/top/Makefile b/hw/syn/quartus/top/Makefile
index 9c34e330..81acb048 100644
--- a/hw/syn/quartus/top/Makefile
+++ b/hw/syn/quartus/top/Makefile
@@ -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
 
diff --git a/hw/verilator/simulator.cpp b/hw/verilator/simulator.cpp
index 58070712..732b2d71 100644
--- a/hw/verilator/simulator.cpp
+++ b/hw/verilator/simulator.cpp
@@ -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
diff --git a/hw/verilator/simulator.h b/hw/verilator/simulator.h
index c5f99ed8..97766deb 100644
--- a/hw/verilator/simulator.h
+++ b/hw/verilator/simulator.h
@@ -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
diff --git a/sw/driver/rtlsim/Makefile b/sw/driver/rtlsim/Makefile
index 020694a2..cdbe3fce 100644
--- a/sw/driver/rtlsim/Makefile
+++ b/sw/driver/rtlsim/Makefile
@@ -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