tofino: move tofino into sims/net for consistency

.gitignore

@@ -16,7 +16,7 @@ sims/net/tap/net_tap
 sims/net/switch/net_switch
 sims/net/menshen/menshen_hw
 sims/net/menshen/obj_dir
-sims/tofino/tofino
+sims/net/tofino/tofino
 doc/doxygen
 doc/_build
 images/kernel/kheaders/

experiments/simbricks/simulators.py

@@ -503,7 +503,7 @@ class TofinoNet(NetSim):
         super().__init__()
 
     def run_cmd(self, env):
-        cmd = env.repodir + '/sims/tofino/tofino'
+        cmd = env.repodir + '/sims/net/tofino/tofino'
         cmd += f' -S {self.sync_period} -E {self.eth_latency} -t {self.tofino_log_path}'
         if not self.sync:
             cmd += ' -u'

sims/net/rules.mk

@@ -27,5 +27,6 @@ $(eval $(call subdir,tap))
 $(eval $(call subdir,switch))
 $(eval $(call subdir,pktgen))
 $(eval $(call subdir,menshen))
+$(eval $(call subdir,tofino))
 
 include mk/subdir_post.mk

sims/rules.mk

@@ -25,6 +25,5 @@ include mk/subdir_pre.mk
 $(eval $(call subdir,external))
 $(eval $(call subdir,net))
 $(eval $(call subdir,nic))
-$(eval $(call subdir,tofino))
 
 include mk/subdir_post.mk