From 43fcb6339e361db1f30f525eb842760924fefdaf Mon Sep 17 00:00:00 2001 From: lelzeiny Date: Mon, 6 Mar 2023 17:21:47 -0800 Subject: [PATCH] Merging with current changes --- deploy/support/default-config.yaml | 2 +- deploy/support/templates/build_sbt_template | 6 ------ scripts/generate_config.pl | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/deploy/support/default-config.yaml b/deploy/support/default-config.yaml index 208f9fb..83e44c5 100644 --- a/deploy/support/default-config.yaml +++ b/deploy/support/default-config.yaml @@ -1,5 +1,5 @@ # Path to the chipyard repository to use when generating hardware -chipyard-dir: '../../../../' +chipyard-dir: '/scratch/qijing.huang/chipyard' # Directory to store runtime logs in log-dir: '../logs' diff --git a/deploy/support/templates/build_sbt_template b/deploy/support/templates/build_sbt_template index 9be0aa0..2e23ff1 100644 --- a/deploy/support/templates/build_sbt_template +++ b/deploy/support/templates/build_sbt_template @@ -230,12 +230,6 @@ lazy val iocell = Project(id = "iocell", base = file("./tools/barstools/") / "sr .settings(chiselSettings) .settings(commonSettings) -lazy val tapeout = (project in file("./tools/barstools/")) - .settings(chiselSettings) - .settings(chiselTestSettings) - .enablePlugins(sbtassembly.AssemblyPlugin) - .settings(commonSettings) - lazy val dsptools = freshProject("dsptools", file("./tools/dsptools")) .settings( chiselSettings, diff --git a/scripts/generate_config.pl b/scripts/generate_config.pl index 410de5a..7c00c99 100644 --- a/scripts/generate_config.pl +++ b/scripts/generate_config.pl @@ -51,7 +51,7 @@ class WithHLSRoCCExample extends Config((site, here, up) => { $rocc .= "\n})\n"; #} - open CONFIG, ">$rdir/generators/example/src/main/scala/HLSConfig.scala" or die "$!\n"; + open CONFIG, ">$rdir/generators/chipyard/src/main/scala/config/HLSConfig.scala" or die "$!\n"; my $config="package example import chisel3._ import freechips.rocketchip.diplomacy.{LazyModule, ValName}