Merge branch 'main' into build_conda_check

Author: Fi50

conda-reqs/chipyard-extended.yaml

@@ -69,7 +69,7 @@ dependencies:
 
     # hammer packages
     - sty
-    - open_pdks.sky130a
+    # - open_pdks.sky130a
     - pip:
         - hammer-vlsi[asap7]==1.2.0
 

conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml

@@ -43,7 +43,7 @@ Spike-as-a-Tile can be configured with custom IPC, commit logging, and other beh
 
 ..  code-block:: shell
 
-    make CONFIG=SpikeUltraFastConfig run-binary BINARY=hello.riscv EXTRA_SPIKE_FLAGS="+spike-ipc=10000 +spike-fast-clint +spike-debug" LOADMEM=1
+    make CONFIG=SpikeUltraFastConfig run-binary BINARY=hello.riscv EXTRA_SIM_FLAGS="+spike-ipc=10000 +spike-fast-clint +spike-debug" LOADMEM=1
 
 
 * ``+spike-ipc=``: Sets the maximum number of instructions Spike can retire in a single "tick", or cycle of the uncore simulation.

docs/Software/Spike.rst

@@ -8,7 +8,6 @@ import org.chipsalliance.cde.config.{Config}
 
 // DOC include start: FFTRocketConfig
 class FFTRocketConfig extends Config(
-  new chipyard.harness.WithDontTouchChipTopPorts(false) ++              // TODO: hack around dontTouch not working in SFC
   new fftgenerator.WithFFTGenerator(numPoints=8, width=16, decPt=8) ++ // add 8-point mmio fft at the default addr (0x2400) with 16bit fixed-point numbers.
   new freechips.rocketchip.rocket.WithNHugeCores(1) ++
   new chipyard.config.AbstractConfig)
@@ -64,7 +63,6 @@ class LargeNVDLARocketConfig extends Config(
 
 class ManyMMIOAcceleratorRocketConfig extends Config(
   new chipyard.example.WithInitZero(0x88000000L, 0x1000L) ++   // add InitZero
-  new chipyard.harness.WithDontTouchChipTopPorts(false) ++   // TODO: hack around dontTouch not working in SFC
   new fftgenerator.WithFFTGenerator(numPoints=8, width=16, decPt=8) ++ // add 8-point mmio fft at the default addr (0x2400) with 16bit fixed-point numbers.
   new chipyard.example.WithStreamingPassthrough ++          // use top with tilelink-controlled streaming passthrough
   new chipyard.example.WithStreamingFIR ++                  // use top with tilelink-controlled streaming FIR

generators/chipyard/src/main/scala/config/MMIOAcceleratorConfigs.scala

@@ -17,7 +17,6 @@ class DualRocketConfig extends Config(
   new chipyard.config.AbstractConfig)
 
 class TinyRocketConfig extends Config(
-  new chipyard.harness.WithDontTouchChipTopPorts(false) ++        // TODO FIX: Don't dontTouch the ports
   new testchipip.soc.WithNoScratchpads ++                         // All memory is the Rocket TCMs
   new freechips.rocketchip.subsystem.WithIncoherentBusTopology ++ // use incoherent bus topology
   new freechips.rocketchip.subsystem.WithNBanks(0) ++             // remove L2$

generators/chipyard/src/main/scala/config/RocketConfigs.scala

@@ -53,7 +53,6 @@ class TutorialMMIOConfig extends Config(
 
 // Tutorial Phase 5: Map a multicore heterogeneous SoC with multiple cores and memory-mapped accelerators
 class TutorialNoCConfig extends Config(
-  new chipyard.harness.WithDontTouchChipTopPorts(false) ++
   // Try changing the dimensions of the Mesh topology
   new constellation.soc.WithGlobalNoC(constellation.soc.GlobalNoCParams(
     NoCParams(

generators/chipyard/src/main/scala/config/TutorialConfigs.scala

@@ -198,7 +198,9 @@ conda environment or \`source env.sh\` and skip this step with \`-s 1\`." >&2
     fi
     echo "Storing main conda environment in $CONDA_ENV_NAME"
 
-    conda-lock install --conda $(which conda) $CONDA_ENV_ARG $LOCKFILE &&
+    conda-lock install --conda $CONDA_EXE $CONDA_ENV_ARG $LOCKFILE &&
+    ## If the above line errors in your environment, you can try the line below
+    # conda-lock install --conda $(which conda) $CONDA_ENV_ARG $LOCKFILE &&
     source $(conda info --base)/etc/profile.d/conda.sh &&
     conda activate $CONDA_ENV_NAME
     exit_if_last_command_failed