Skip to content
Snippets Groups Projects
Commit 159cde7d authored by dam1n19's avatar dam1n19
Browse files

SOC1-204: Refactored flow/tools to be in soctools instead of project repostiory

parent 06dec841
No related branches found
No related tags found
No related merge requests found
...@@ -2,4 +2,7 @@ ...@@ -2,4 +2,7 @@
*.vvp *.vvp
simulate/sim/* simulate/sim/*
.socinit .socinit
system/bootrom wrapper/html
\ No newline at end of file system/bootrom
system/html
flist/tmp
\ No newline at end of file
...@@ -4,8 +4,8 @@ url = https://git.soton.ac.uk/soclabs/accelerator_wrapper_tech.git ...@@ -4,8 +4,8 @@ url = https://git.soton.ac.uk/soclabs/accelerator_wrapper_tech.git
[submodule "nanosoc_tech"] [submodule "nanosoc_tech"]
path = nanosoc_tech path = nanosoc_tech
url = https://git.soton.ac.uk/soclabs/nanosoc_tech.git url = https://git.soton.ac.uk/soclabs/nanosoc_tech.git
[submodule "socsim_flow"] [submodule "soctools_flow"]
path = socsim_flow path = soctools_flow
url = https://git.soton.ac.uk/soclabs/socsim_flow.git url = https://git.soton.ac.uk/soclabs/socsim_flow.git
[submodule "chipkit_flow"] [submodule "chipkit_flow"]
path = chipkit_flow path = chipkit_flow
......
...@@ -39,5 +39,5 @@ export GENERIC_LIB_TECH_DIR="$PROJECT_DIR/generic_lib_tech" ...@@ -39,5 +39,5 @@ export GENERIC_LIB_TECH_DIR="$PROJECT_DIR/generic_lib_tech"
# CHIPKIT - Register Generation # CHIPKIT - Register Generation
export CHIPKIT_FLOW_DIR="$PROJECT_DIR/chipkit_flow" export CHIPKIT_FLOW_DIR="$PROJECT_DIR/chipkit_flow"
# SoCSim - Basic Simulation Flow Wrapper # SoCTools - Toolkit of scripts related to SoCLabs projects
export SOCSIM_FLOW_DIR="$PROJECT_DIR/socsim_flow" export SOCTOOLS_FLOW_DIR="$PROJECT_DIR/socsim_flow"
\ No newline at end of file \ No newline at end of file
#-----------------------------------------------------------------------------
# SoC Labs icarus verilog simulation script for engine testbench
# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
#
# Contributors
#
# David Mapstone (d.a.mapstone@soton.ac.uk)
#
# Copyright 2022, SoC Labs (www.soclabs.org)
#-----------------------------------------------------------------------------
#!/usr/bin/env bash
mkdir -p $PROJECT_DIR/simulate/sim/
iverilog -g2012 -o $PROJECT_DIR/simulate/sim/$1.vvp $WRAPPER_TECH_DIR/hdl/verif/tb_$1.sv
cd $PROJECT_DIR/simulate/sim/ && vvp $1.vvp $2
\ No newline at end of file
#!/bin/bash
# Update all Submodules to latest commit
cd $DESIGN_ROOT; git submodule foreach --recursive git pull
# for d in $DESIGN_ROOT/* ; do
# if [ -f "$d/.git" ]; then
# echo "Git Pulling $d"
# cd $d; git pull; cd ..
# fi
# done
\ No newline at end of file
#-----------------------------------------------------------------------------
# SoC Labs socsim script to run required simulation
# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
#
# Contributors
#
# David Mapstone (d.a.mapstone@soton.ac.uk)
#
# Copyright 2022, SoC Labs (www.soclabs.org)
#-----------------------------------------------------------------------------
#!/usr/bin/env bash
DEFAULT_SIMULATOR="ivlog"
if [[ -z "${SIMULATOR}" ]]; then
SIMULATOR=$DEFAULT_SIMULATOR
fi
# $PROJECT_DIR"/flow/simulators/"$SIMULATOR"_sim.sh" $@
for d in $PROJECT_DIR/* ; do
if [ -f "$d/.git" ]; then
if [ -f "$d/simulate/socsim/$1.sh" ]; then
# If .git file exists - submodule
bash $d/simulate/socsim/$1.sh
fi
fi
done
\ No newline at end of file
Subproject commit 69e79bf881a73af0b3ee04e25835450ed2635718 Subproject commit 53dca95d66a93333a7e6e8bbbda0696a348da0b5
Subproject commit 9e4a4da0a9dd45c84a787c4cf73294e7a412aff4 Subproject commit 263c129eee99942b27c5c6199ec91b81c85021c3
...@@ -30,8 +30,6 @@ else ...@@ -30,8 +30,6 @@ else
if [ $PROJECT_DIR = $DESIGN_ROOT ]; then if [ $PROJECT_DIR = $DESIGN_ROOT ]; then
echo "Design Workspace: $DESIGN_ROOT" echo "Design Workspace: $DESIGN_ROOT"
export DESIGN_ROOT export DESIGN_ROOT
# Set Default Simulator
export SIMULATOR="ivlog"
fi fi
# Source dependency environment variable script # Source dependency environment variable script
...@@ -45,7 +43,7 @@ else ...@@ -45,7 +43,7 @@ else
# "FLOW_DIR" # "FLOW_DIR"
while read line; do while read line; do
eval PATH="$PATH:\$${line}/flow" eval PATH="$PATH:\$${line}/tools"
done <<< "$(awk 'BEGIN{for(v in ENVIRON) print v}' | grep FLOW_DIR)" done <<< "$(awk 'BEGIN{for(v in ENVIRON) print v}' | grep FLOW_DIR)"
# "PROJECT_DIR" # "PROJECT_DIR"
......
Subproject commit 78e5c225440a1dbac511d22f1dec39fa51702e6d
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment