Misc fixes

2022-10-08 19:00:25 -07:00
parent 472c4cb00f
commit edceaf02ab
11 changed files with 818 additions and 837 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-conda-requirements-esp-tools-linux-64.conda-lock.yml linguist-generated=true
-conda-requirements-riscv-tools-linux-64.conda-lock.yml linguist-generated=true
+conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml linguist-generated=true
+conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml linguist-generated=true
--- a/.gitignore
+++ b/.gitignore
@@ -13,12 +13,8 @@ target
 .idea
 .DS_Store
 env.sh
-riscv-tools-install
-esp-tools-install
 tags
 *~
-env-riscv-tools.sh
-env-esp-tools.sh
 .bsp/
 .conda-env/
-.#*
+.#*
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -62,12 +62,13 @@ done

 if [ "$SKIP_CONDA" = false ]; then
    # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154
-    LOCKFILE=$RDIR/conda-requirements-$TOOLCHAIN-linux-64.conda-lock.yml
-    YAMLFILE=$RDIR/conda-requirements-$TOOLCHAIN.yaml
+    CONDA_REQS=$RDIR/conda-reqs
+    CONDA_LOCK_REQS=$CONDA_REQS/conda-lock-reqs
+    LOCKFILE=$CONDA_LOCK_REQS/conda-requirements-$TOOLCHAIN-linux-64.conda-lock.yml

    if [ "$USE_PINNED_DEPS" = false ]; then
        # auto-gen the lockfile
-        conda-lock -f $YAMLFILE -p linux-64 --lockfile $LOCKFILE
+        conda-lock -f $CONDA_REQS/chipyard.yaml -f $CONDA_REQS/$TOOLCHAIN.yaml --lockfile $LOCKFILE
    fi

    # use conda-lock to create env
--- a/common.mk
+++ b/common.mk
@@ -9,6 +9,10 @@ else
 $(info Running with RISCV=$(RISCV))
 endif

+ifndef CONDA_DEFAULT_ENV
+$(warning No conda environment detected. Did you source the Chipyard auto-generated env file?)
+endif
+
 #########################################################################################
 # specify user-interface variables
 #########################################################################################
@@ -101,12 +105,8 @@ $(BOOTROM_TARGETS): $(build_dir)/bootrom.%.img: $(TESTCHIP_RSRCS_DIR)/testchipip
 #########################################################################################
 # create firrtl file rule and variables
 #########################################################################################
-.INTERMEDIATE: generator_temp
-$(FIRRTL_FILE) $(ANNO_FILE): generator_temp
-	@echo "" > /dev/null
-
 # AG: must re-elaborate if cva6 sources have changed... otherwise just run firrtl compile
-generator_temp: $(SCALA_SOURCES) $(sim_files) $(SCALA_BUILDTOOL_DEPS) $(EXTRA_GENERATOR_REQS)
+$(FIRRTL_FILE) $(ANNO_FILE) &: $(SCALA_SOURCES) $(sim_files) $(SCALA_BUILDTOOL_DEPS) $(EXTRA_GENERATOR_REQS)
 	mkdir -p $(build_dir)
 	$(call run_scala_main,$(SBT_PROJECT),$(GENERATOR_PACKAGE).Generator,\
 		--target-dir $(build_dir) \
@@ -128,12 +128,7 @@ TOP_TARGETS = $(TOP_FILE) $(TOP_SMEMS_CONF) $(TOP_ANNO) $(TOP_FIR) $(sim_top_bla
 HARNESS_TARGETS = $(HARNESS_FILE) $(HARNESS_SMEMS_CONF) $(HARNESS_ANNO) $(HARNESS_FIR) $(sim_harness_blackboxes)

 # DOC include start: FirrtlCompiler
-# NOTE: These *_temp intermediate targets will get removed in favor of make 4.3 grouped targets (&: operator)
-.INTERMEDIATE: firrtl_temp
-$(TOP_TARGETS) $(HARNESS_TARGETS): firrtl_temp
-	@echo "" > /dev/null
-
-firrtl_temp: $(FIRRTL_FILE) $(ANNO_FILE) $(VLOG_SOURCES)
+$(TOP_TARGETS) $(HARNESS_TARGETS) &: $(FIRRTL_FILE) $(ANNO_FILE) $(VLOG_SOURCES)
 	$(call run_scala_main,tapeout,barstools.tapeout.transforms.GenerateTopAndHarness,\
 		--allow-unrecognized-annotations \
 		--output-file $(TOP_FILE) \
@@ -158,19 +153,11 @@ firrtl_temp: $(FIRRTL_FILE) $(ANNO_FILE) $(VLOG_SOURCES)

 # This file is for simulation only. VLSI flows should replace this file with one containing hard SRAMs
 MACROCOMPILER_MODE ?= --mode synflops
-.INTERMEDIATE: top_macro_temp
-$(TOP_SMEMS_FILE) $(TOP_SMEMS_FIR): top_macro_temp
-	@echo "" > /dev/null
-
-top_macro_temp: $(TOP_SMEMS_CONF)
+$(TOP_SMEMS_FILE) $(TOP_SMEMS_FIR) &: $(TOP_SMEMS_CONF)
 	$(call run_scala_main,tapeout,barstools.macros.MacroCompiler,-n $(TOP_SMEMS_CONF) -v $(TOP_SMEMS_FILE) -f $(TOP_SMEMS_FIR) $(MACROCOMPILER_MODE))

 HARNESS_MACROCOMPILER_MODE = --mode synflops
-.INTERMEDIATE: harness_macro_temp
-$(HARNESS_SMEMS_FILE) $(HARNESS_SMEMS_FIR): harness_macro_temp
-	@echo "" > /dev/null
-
-harness_macro_temp: $(HARNESS_SMEMS_CONF) | top_macro_temp
+$(HARNESS_SMEMS_FILE) $(HARNESS_SMEMS_FIR) &: $(HARNESS_SMEMS_CONF) | $(TOP_SMEMS_FILE)
 	$(call run_scala_main,tapeout,barstools.macros.MacroCompiler, -n $(HARNESS_SMEMS_CONF) -v $(HARNESS_SMEMS_FILE) -f $(HARNESS_SMEMS_FIR) $(HARNESS_MACROCOMPILER_MODE))

 ########################################################################################
--- a/conda-requirements-esp-tools.yaml
+++ b/conda-requirements-esp-tools.yaml
@@ -3,6 +3,9 @@ channels:
    - conda-forge
    - nodefaults

+platforms:
+    - linux-64
+
 dependencies:
    # https://conda-forge.org/feedstock-outputs/
    #   filterable list of all conda-forge packages
@@ -26,7 +29,6 @@ dependencies:
    - binutils

    - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
-    - esp-tools # from ucb-bar channel - https://github.com/ucb-bar/esp-tools-feedstock

    # firemarshal deps
    - python>=3.8
--- a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
--- a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
--- a/conda-reqs/esp-tools.yaml
+++ b/conda-reqs/esp-tools.yaml
@@ -0,0 +1,17 @@
+channels:
+    - ucb-bar
+    - conda-forge
+    - nodefaults
+
+platforms:
+    - linux-64
+
+dependencies:
+    # https://conda-forge.org/feedstock-outputs/
+    #   filterable list of all conda-forge packages
+    # https://conda-forge.org/#contribute
+    #   instructions on adding a recipe
+    # https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications
+    #   documentation on package_spec syntax for constraining versions
+
+    - esp-tools # from ucb-bar channel - https://github.com/ucb-bar/esp-tools-feedstock
--- a/conda-reqs/riscv-tools.yaml
+++ b/conda-reqs/riscv-tools.yaml
@@ -0,0 +1,17 @@
+channels:
+    - ucb-bar
+    - conda-forge
+    - nodefaults
+
+platforms:
+    - linux-64
+
+dependencies:
+    # https://conda-forge.org/feedstock-outputs/
+    #   filterable list of all conda-forge packages
+    # https://conda-forge.org/#contribute
+    #   instructions on adding a recipe
+    # https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications
+    #   documentation on package_spec syntax for constraining versions
+
+    - riscv-tools # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock
--- a/conda-requirements-riscv-tools.yaml
+++ b/conda-requirements-riscv-tools.yaml
@@ -1,132 +0,0 @@
-channels:
-    - ucb-bar
-    - conda-forge
-    - nodefaults
-
-dependencies:
-    # https://conda-forge.org/feedstock-outputs/
-    #   filterable list of all conda-forge packages
-    # https://conda-forge.org/#contribute
-    #   instructions on adding a recipe
-    # https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications
-    #   documentation on package_spec syntax for constraining versions
-
-
-    # handy tool for introspecting package relationships and file ownership
-    # see https://github.com/rvalieris/conda-tree
-    - conda-tree
-
-    # bundle FireSim driver with deps into installer shell-script
-    - constructor
-
-    - gcc
-    - gxx
-    - sysroot_linux-64>=2.17 # needed to match pre-built CI XRT glibc version
-    - conda-gcc-specs
-    - binutils
-
-    - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
-    - riscv-tools # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock
-
-    # firemarshal deps
-    - python>=3.8
-    - bc
-    - patch
-    - which
-    - diffutils
-    - bash
-    - gzip
-    - bzip2
-    - perl
-    - tar
-    - file
-    - findutils
-    - rsync
-    - psutil
-    - doit=0.35.0
-    - gitpython
-    - humanfriendly
-    - e2fsprogs
-    - ctags
-    - bison
-    - flex
-    - expat
-    - make
-    - pyyaml
-    - unzip
-    - readline
-    - coreutils
-    - lzop
-    - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
-
-    - bash-completion
-    - sbt
-    - ca-certificates
-    - mosh
-    - gmp
-    - mpfr
-    - mpc
-    - zlib
-    - vim
-    - git
-    - openjdk
-    - gengetopt
-    - libffi
-    - expat
-    - libusb1
-    - ncurses
-    - cmake
-    - graphviz
-    - expect
-    - dtc
-    - verilator==4.226
-    - screen
-    - elfutils
-    - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
-    - conda-lock>=1
-    - wget
-    - sed
-    - autoconf
-
-    # clang-format for driver coding style enforcement.
-    - clang-format
-    - clang-tools
-
-    # python packages
-    # While it is possible to install using pip after creating the
-    # conda environment, pip's dependency resolution can conflict with
-    # conda and create broken environments.  It's best to use the conda
-    # packages so that the environment is consistent
-    - boto3==1.20.21
-    - colorama==0.4.3
-    - argcomplete==1.12.3
-    - python-graphviz==0.19
-    - pyparsing==3.0.6
-    - numpy==1.19.5
-    - kiwisolver==1.3.1
-    - matplotlib-base==3.3.4
-    - pandas==1.1.5
-    - awscli==1.22.21
-    - pytest==6.2.5
-    - pytest-dependency==0.5.1
-    - pytest-mock==3.7.0
-    - moto==3.1.0
-    - pyyaml==5.4.1
-    - mypy==0.931
-    - types-pyyaml==6.0.4
-    - boto3-stubs==1.21.6
-    - botocore-stubs==1.24.7
-    - mypy-boto3-s3==1.21.0
-    - pip
-    - pip:
-        - fab-classic==1.19.1
-        - mypy-boto3-ec2==1.21.9
-        - sure==2.0.0
-        - pylddwrap==1.2.1
-
-    # doc requirements
-    - sphinx
-    - pygments
-    - sphinx-autobuild
-    - sphinx_rtd_theme
-    - docutils
--- a/scripts/init-submodules-no-riscv-tools-nolog.sh
+++ b/scripts/init-submodules-no-riscv-tools-nolog.sh
@@ -152,7 +152,4 @@ cat << EOT >> env.sh
 __DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"
 PATH=\$__DIR/bin:\$PATH
 PATH=\$__DIR/software/firemarshal:\$PATH
-if [ -z \${CONDA_DEFAULT_ENV+x} ]; then
-    echo "WARNING: No conda environment detected. Did you activate the conda environment (e.x. 'conda activate chipyard')?"
-fi
 EOT