update libraries directory structure

sims/net/switch/rules.mk

@@ -26,8 +26,7 @@ bin_net_switch := $(d)net_switch
 
 OBJS := $(d)net_switch.o
 
-$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/ -I$(lib_proto_inc) \
-    -I$(lib_netsim_inc)
+$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
 $(bin_net_switch): $(OBJS) $(lib_netsim) -lpcap
 

sims/net/tap/net_tap.c

@@ -33,7 +33,7 @@
 #include <linux/if.h>
 #include <linux/if_tun.h>
 
-#include <netsim.h>
+#include <simbricks/netif/netsim.h>
 
 //#define DEBUG_PKTMETA
 

sims/net/tap/rules.mk

@@ -26,8 +26,7 @@ bin_net_tap := $(d)net_tap
 
 OBJS := $(d)net_tap.o
 
-$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/ -I$(lib_proto_inc) \
-    -I$(lib_netsim_inc)
+$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
 $(bin_net_tap): $(OBJS) $(lib_netsim) -lpcap -lpthread
 

sims/net/wire/net_wire.c

@@ -36,7 +36,7 @@
 #include <pcap/pcap.h>
 #include <assert.h>
 
-#include <netsim.h>
+#include <simbricks/netif/netsim.h>
 
 static uint64_t sync_period = (500 * 1000ULL); // 500ns
 static uint64_t eth_latency = (500 * 1000ULL); // 500ns

sims/net/wire/rules.mk

@@ -26,8 +26,7 @@ bin_net_wire := $(d)net_wire
 
 OBJS := $(d)net_wire.o
 
-$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/ -I$(lib_proto_inc) \
-    -I$(lib_netsim_inc)
+$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
 $(bin_net_wire): $(OBJS) $(lib_netsim) -lpcap
 

sims/nic/corundum/corundum_verilator.cpp

@@ -28,7 +28,7 @@
 #include <signal.h>
 
 extern "C" {
-    #include <nicsim.h>
+    #include <simbricks/nicif/nicsim.h>
 }
 
 #include "Vinterface.h"

sims/nic/corundum/rules.mk

@@ -34,12 +34,11 @@ vsrcs_corundum := $(wildcard $(d)rtl/*.v $(d)lib/*/rtl/*.v \
 srcs_corundum := $(addprefix $(d),corundum_verilator.cpp dma.cpp mem.cpp)
 OBJS := $(srcs_corundum:.cpp=.o)
 
-$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/ -I$(lib_proto_inc) \
-    -I$(lib_nicbm_inc) -I$(lib_nicsim_inc)
+$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
 $(verilator_src_corundum): $(vsrcs_corundum)
 	$(VERILATOR) $(VFLAGS) --cc -O3 \
-	    -CFLAGS "-I$(abspath $(lib_nicsim_inc)) -I$(abspath $(lib_proto_inc)) -O3 -g -Wall -Wno-maybe-uninitialized" \
+	    -CFLAGS "-I$(abspath $(lib_dir)) -O3 -g -Wall -Wno-maybe-uninitialized" \
 	    --Mdir $(verilator_dir_corundum) \
 	    -y $(dir_corundum)rtl \
 	    -y $(dir_corundum)lib/axi/rtl \

sims/nic/corundum_bm/corundum_bm.h

@@ -28,9 +28,9 @@
 #include <vector>
 #include <stdint.h>
 extern "C" {
-#include <cosim_pcie_proto.h>
+#include <simbricks/proto/pcie.h>
 }
-#include <nicbm.h>
+#include <simbricks/nicbm/nicbm.h>
 
 typedef uint32_t reg_t;
 typedef uint64_t addr_t;

sims/nic/corundum_bm/rules.mk

@@ -29,8 +29,7 @@ objs_corundum_bm := $(d)corundum_bm.o
 objs_corundum_bm_tester := $(d)tester.o
 OBJS := $(objs_corundum_bm) $(objs_corundum_bm_tester)
 
-$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/ -I$(lib_proto_inc) \
-    -I$(lib_nicbm_inc) -I$(lib_nicsim_inc)
+$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
 $(bin_corundum_bm): $(objs_corundum_bm) $(lib_nicbm) $(lib_nicsim)
 $(bin_corundum_bm_tester): $(objs_corundum_bm_tester) $(lib_nicbm) $(lib_nicsim)

sims/nic/i40e_bm/i40e_bm.h

@@ -28,9 +28,9 @@
 #include <sstream>
 #include <stdint.h>
 extern "C" {
-#include <cosim_pcie_proto.h>
+#include <simbricks/proto/pcie.h>
 }
-#include <nicbm.h>
+#include <simbricks/nicbm/nicbm.h>
 
 //#define DEBUG_DEV
 //#define DEBUG_ADMINQ

sims/nic/i40e_bm/rules.mk

@@ -27,8 +27,7 @@ bin_i40e_bm := $(d)i40e_bm
 OBJS := $(addprefix $(d),i40e_bm.o i40e_queues.o i40e_adminq.o i40e_hmc.o \
     i40e_lan.o xsums.o rss.o logger.o)
 
-$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/ -I$(lib_proto_inc) \
-    -I$(lib_nicbm_inc) -I$(lib_nicsim_inc)
+$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
 $(bin_i40e_bm): $(OBJS) $(lib_nicbm) $(lib_nicsim)