From 7b20609d4dd751146c77a79dcdbad4572c9b1210 Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Fri, 19 Aug 2016 10:58:56 -0700 Subject: [PATCH] reorganize moving non-submodule packages into src/main/scala --- Makefrag | 5 +- coreplex/build.sbt | 10 -- groundtest/.gitignore | 1 - groundtest/README.md | 150 ------------------ groundtest/build.sbt | 10 -- junctions/.gitignore | 17 -- junctions/LICENSE | 28 ---- junctions/README.md | 6 - junctions/build.sbt | 19 --- junctions/project/plugins.sbt | 5 - project/build.scala | 7 +- rocket/.gitignore | 1 - rocket/LICENSE | 24 --- rocket/README.md | 29 ---- rocket/build.sbt | 10 -- .../main/scala/coreplex}/Configs.scala | 0 .../main/scala/coreplex}/Coreplex.scala | 0 .../scala/coreplex}/DirectGroundTest.scala | 0 .../main/scala/coreplex}/TestConfigs.scala | 0 .../main/scala/coreplex}/Testing.scala | 0 .../main/scala/coreplex}/UnitTest.scala | 0 .../scala/groundtest}/BusMasterTest.scala | 0 .../scala/groundtest}/CacheFillTest.scala | 0 .../main/scala/groundtest}/Comparator.scala | 0 .../main/scala/groundtest}/Generator.scala | 0 .../main/scala/groundtest}/NastiTest.scala | 0 .../main/scala/groundtest}/Regression.scala | 0 .../main/scala/groundtest}/Tile.scala | 0 .../main/scala/groundtest}/TraceGen.scala | 0 .../main/scala/groundtest}/Util.scala | 0 .../main/scala/junctions}/addrmap.scala | 0 .../main/scala/junctions}/atos.scala | 0 .../main/scala/junctions}/crossing.scala | 0 .../main/scala/junctions}/hasti.scala | 0 .../main/scala/junctions}/memserdes.scala | 0 .../main/scala/junctions}/nasti.scala | 0 .../main/scala/junctions}/package.scala | 0 .../main/scala/junctions}/poci.scala | 0 .../main/scala/junctions}/slowio.scala | 0 .../main/scala/junctions}/smi.scala | 0 .../main/scala/junctions}/stream.scala | 0 .../junctions}/unittests/MiscNastiTests.scala | 0 .../unittests/MultiWidthFifoTest.scala | 0 .../junctions}/unittests/NastiDemuxTest.scala | 0 .../scala/junctions}/unittests/UnitTest.scala | 0 .../main/scala/junctions}/util.scala | 0 .../main/scala/rocket}/arbiter.scala | 0 .../main/scala/rocket}/breakpoint.scala | 0 .../scala => src/main/scala/rocket}/btb.scala | 0 .../main/scala/rocket}/consts.scala | 0 .../scala => src/main/scala/rocket}/csr.scala | 0 .../main/scala/rocket}/dcache.scala | 0 .../main/scala/rocket}/decode.scala | 0 .../main/scala/rocket}/dpath_alu.scala | 0 .../scala => src/main/scala/rocket}/fpu.scala | 0 .../main/scala/rocket}/frontend.scala | 0 .../main/scala/rocket}/ibuf.scala | 0 .../main/scala/rocket}/icache.scala | 0 .../main/scala/rocket}/idecode.scala | 0 .../main/scala/rocket}/instructions.scala | 0 .../main/scala/rocket}/multiplier.scala | 0 .../main/scala/rocket}/nbdcache.scala | 0 .../main/scala/rocket}/package.scala | 0 .../scala => src/main/scala/rocket}/ptw.scala | 0 .../main/scala/rocket}/rocc.scala | 0 .../main/scala/rocket}/rocket.scala | 0 .../scala => src/main/scala/rocket}/rvc.scala | 0 .../main/scala/rocket}/tile.scala | 0 .../scala => src/main/scala/rocket}/tlb.scala | 0 .../main/scala/rocket}/util.scala | 0 .../main/scala/uncore}/Builder.scala | 0 .../main/scala/uncore}/Consts.scala | 0 .../main/scala/uncore}/Package.scala | 0 .../main/scala/uncore}/agents/Agents.scala | 0 .../main/scala/uncore}/agents/Broadcast.scala | 0 .../scala/uncore}/agents/Bufferless.scala | 0 .../main/scala/uncore}/agents/Cache.scala | 0 .../main/scala/uncore}/agents/Ecc.scala | 0 .../main/scala/uncore}/agents/Mmio.scala | 0 .../uncore}/agents/StatelessBridge.scala | 0 .../scala/uncore}/agents/StoreDataQueue.scala | 0 .../main/scala/uncore}/agents/Trackers.scala | 0 .../scala/uncore}/coherence/Directory.scala | 0 .../scala/uncore}/coherence/Metadata.scala | 0 .../scala/uncore}/coherence/Policies.scala | 0 .../main/scala/uncore}/converters/Ahb.scala | 0 .../main/scala/uncore}/converters/Nasti.scala | 0 .../main/scala/uncore}/converters/Smi.scala | 0 .../scala/uncore}/converters/Tilelink.scala | 0 .../main/scala/uncore}/devices/Bram.scala | 0 .../main/scala/uncore}/devices/Debug.scala | 0 .../main/scala/uncore}/devices/Plic.scala | 0 .../main/scala/uncore}/devices/Prci.scala | 0 .../main/scala/uncore}/devices/Rom.scala | 0 .../scala/uncore}/tilelink/Arbiters.scala | 0 .../scala/uncore}/tilelink/Definitions.scala | 0 .../scala/uncore}/tilelink/Interconnect.scala | 0 .../main/scala/uncore}/tilelink/Network.scala | 0 .../scala/uncore}/unittests/Drivers.scala | 0 .../main/scala/uncore}/unittests/Tests.scala | 0 .../main/scala/uncore}/util/AmoAlu.scala | 0 .../main/scala/uncore}/util/Counters.scala | 0 .../main/scala/uncore}/util/Enqueuer.scala | 0 .../main/scala/uncore}/util/Package.scala | 0 .../main/scala/uncore}/util/Serializer.scala | 0 uncore/.gitignore | 2 - uncore/LICENSE | 24 --- uncore/README.md | 12 -- uncore/build.sbt | 19 --- uncore/project/plugins.sbt | 5 - 110 files changed, 3 insertions(+), 381 deletions(-) delete mode 100644 coreplex/build.sbt delete mode 100644 groundtest/.gitignore delete mode 100644 groundtest/README.md delete mode 100644 groundtest/build.sbt delete mode 100644 junctions/.gitignore delete mode 100644 junctions/LICENSE delete mode 100644 junctions/README.md delete mode 100644 junctions/build.sbt delete mode 100644 junctions/project/plugins.sbt delete mode 100644 rocket/.gitignore delete mode 100644 rocket/LICENSE delete mode 100644 rocket/README.md delete mode 100644 rocket/build.sbt rename {coreplex/src/main/scala => src/main/scala/coreplex}/Configs.scala (100%) rename {coreplex/src/main/scala => src/main/scala/coreplex}/Coreplex.scala (100%) rename {coreplex/src/main/scala => src/main/scala/coreplex}/DirectGroundTest.scala (100%) rename {coreplex/src/main/scala => src/main/scala/coreplex}/TestConfigs.scala (100%) rename {coreplex/src/main/scala => src/main/scala/coreplex}/Testing.scala (100%) rename {coreplex/src/main/scala => src/main/scala/coreplex}/UnitTest.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/BusMasterTest.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/CacheFillTest.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/Comparator.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/Generator.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/NastiTest.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/Regression.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/Tile.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/TraceGen.scala (100%) rename {groundtest/src/main/scala => src/main/scala/groundtest}/Util.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/addrmap.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/atos.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/crossing.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/hasti.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/memserdes.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/nasti.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/package.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/poci.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/slowio.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/smi.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/stream.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/unittests/MiscNastiTests.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/unittests/MultiWidthFifoTest.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/unittests/NastiDemuxTest.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/unittests/UnitTest.scala (100%) rename {junctions/src/main/scala => src/main/scala/junctions}/util.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/arbiter.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/breakpoint.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/btb.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/consts.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/csr.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/dcache.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/decode.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/dpath_alu.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/fpu.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/frontend.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/ibuf.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/icache.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/idecode.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/instructions.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/multiplier.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/nbdcache.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/package.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/ptw.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/rocc.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/rocket.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/rvc.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/tile.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/tlb.scala (100%) rename {rocket/src/main/scala => src/main/scala/rocket}/util.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/Builder.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/Consts.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/Package.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/Agents.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/Broadcast.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/Bufferless.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/Cache.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/Ecc.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/Mmio.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/StatelessBridge.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/StoreDataQueue.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/agents/Trackers.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/coherence/Directory.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/coherence/Metadata.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/coherence/Policies.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/converters/Ahb.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/converters/Nasti.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/converters/Smi.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/converters/Tilelink.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/devices/Bram.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/devices/Debug.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/devices/Plic.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/devices/Prci.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/devices/Rom.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/tilelink/Arbiters.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/tilelink/Definitions.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/tilelink/Interconnect.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/tilelink/Network.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/unittests/Drivers.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/unittests/Tests.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/util/AmoAlu.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/util/Counters.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/util/Enqueuer.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/util/Package.scala (100%) rename {uncore/src/main/scala => src/main/scala/uncore}/util/Serializer.scala (100%) delete mode 100644 uncore/.gitignore delete mode 100644 uncore/LICENSE delete mode 100644 uncore/README.md delete mode 100644 uncore/build.sbt delete mode 100644 uncore/project/plugins.sbt diff --git a/Makefrag b/Makefrag index 417ca43e..86893223 100644 --- a/Makefrag +++ b/Makefrag @@ -20,9 +20,8 @@ $(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala") CHISEL_ARGS := --targetDir $(generated_dir) src_path = src/main/scala -default_submodules = . junctions uncore hardfloat rocket groundtest coreplex context-dependent-environments -chisel_srcs = $(foreach submodule,$(default_submodules) $(ROCKETCHIP_ADDONS),$(wildcard $(base_dir)/$(submodule)/$(src_path)/*.scala)) -chisel_srcs += $(foreach submodule,$(default_submodules) $(ROCKETCHIP_ADDONS),$(wildcard $(base_dir)/$(submodule)/$(src_path)/*/*.scala)) +default_submodules = . hardfloat context-dependent-environments chisel3 +chisel_srcs = $(foreach submodule,$(default_submodules) $(ROCKETCHIP_ADDONS),$(shell find $(base_dir)/$(submodule)/$(src_path) -name "*.scala")) disasm := 2> which_disasm := $(shell which spike-dasm 2> /dev/null) diff --git a/coreplex/build.sbt b/coreplex/build.sbt deleted file mode 100644 index 19122610..00000000 --- a/coreplex/build.sbt +++ /dev/null @@ -1,10 +0,0 @@ -organization := "edu.berkeley.cs" - -version := "1.0" - -name := "coreplex" - -scalaVersion := "2.11.6" - -libraryDependencies ++= (Seq("chisel", "uncore", "junctions", "rocket", "groundtest").map { - dep: String => sys.props.get(dep + "Version") map { "edu.berkeley.cs" %% dep % _ }}).flatten diff --git a/groundtest/.gitignore b/groundtest/.gitignore deleted file mode 100644 index eb5a316c..00000000 --- a/groundtest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target diff --git a/groundtest/README.md b/groundtest/README.md deleted file mode 100644 index 4f896259..00000000 --- a/groundtest/README.md +++ /dev/null @@ -1,150 +0,0 @@ -# groundtest - -A memory tester circuit for Rocket Chip's memory system. The generator tile -plugs into the existing SoC generator as what looks like a CPU. However, -instead of running programs, the tile generates fixed memory requests out to -the L2. There are both cached and uncached generators. The cached generator -has an intervening L1 cache, the uncached generator sends TileLink requests -directly to the L2. - -Assertions are set to fail if the wrong data comes back or if a request times -out waiting for the response. - -## Configuring Rocket-Chip with groundtest - -The groundtest package defines a GroundTestTile, which extends a -rocket-chip Tile. A number of Configs in rocket-chip instantiate -GroundTestTile(s) in place of other types of Tiles (see -[TestConfigs.scala](https://github.com/ucb-bar/rocket-chip/blob/master/src/main/scala/TestConfigs.scala)). - -Running a ground test can be achieved in rocket-chip as follows -(assuming the `build.sh` script in the -`rocket-chip/riscv-tools` directory has already been run). - -``` -cd emulator -make CONFIG= -ln -s ../riscv-tools/riscv-tests/build/isa/rv64ui-p-simple -./emulator-Top- rv64ui-p-simple -``` - -Currently the Configs which include GroundTestTile(s) are: - -- MemtestConfig -- MemtestL2Config -- BroadcastRegressionTestConfig -- CacheRegressionTestConfig -- UnitTestConfig -- TraceGenConfig -- ComparatorConfig -- ComparatorL2Config - -The usual Make targets run-asm-tests and run-bmark-tests still work for these configurations, though they don't do much. - -## Using TraceGenConfig - -The trace generator in groundtest -([tracegen.scala](https://github.com/ucb-bar/groundtest/blob/master/src/main/scala/tracegen.scala)) has the ability to generate random memory-subsystem traces, i.e. random sequences of memory requests, along with their responses. The idea is that these traces can be validated by an external checker, such as [axe](https://github.com/CTSRD-CHERI/axe). - -Putting the generator and the checker together, we can automatically search for invalid traces, i.e. possible bugs in the memory subsystem. This is useful for intensive testing, but also debugging: it is possible to search for simple failing cases. - -### Quick Reference - -The [tracegen+check.sh](https://github.com/ucb-bar/groundtest/blob/master/scripts/tracegen%2Bcheck.sh) script provides an automated way to run a number of randomized tests. The number of tests, initial seed, and other parameters can be set via environment variables or the command line, see the script for more details. - -Before running the script, first ensure that: - -- the file `rocket-chip/riscv-tools/riscv-tests/build/isa/rv64ui-p-simple` - exists (this is produced by the `build.sh` script in the - `rocket-chip/riscv-tools` directory); -- `rocket-chip/groundtest/scripts` in your `PATH`; -- `rocket-chip/emulator` is your current working directory. - -Now the script can be run as follows. - -``` -> make CONFIG=TraceGenConfig -> tracegen+check.sh -Testing against WMO model: - - 0: .......... .......... .......... .......... .......... - 50: .......... .......... .......... .......... .......... - -OK, passed 100 tests -LR/SC success rate: 88% -Load-external rate: 45% -``` - -### Running Manually - -Suppose we have built the Rocket Chip emulator with the TraceGenConfig -configuration as above. Running it using the -[tracegen.py](https://github.com/ucb-bar/groundtest/blob/master/scripts/tracegen.py) -wrapper script with a few command-line options gives us a random -trace: - -``` - > tracegen.py ./emulator-Top-TraceGenConfig 1 rv64ui-p-simple - 1: load-req 0x0000000008 #0 @64 - 1: store-req 5 0x0000100008 #1 @65 - 1: store-req 7 0x0000000010 #2 @66 - 0: store-req 2 0x0000000008 #0 @303 - 0: load-req 0x0000000008 #1 @304 - 0: store-req 6 0x0000100008 #2 @305 - 1: resp 0 #0 @96 - 0: resp 0 #0 @350 - 0: resp 2 #1 @351 - 0: load-req 0x0000000010 #3 @353 - 1: resp 0 #1 @149 - 1: load-req 0x0000000108 #3 @152 - 1: resp 0 #3 @184 - 0: resp 5 #2 @422 - 0: resp 0 #3 @424 - 1: resp 0 #2 @226 - ... -``` - -Main points: - -- the second command-line option sets the random seed; -- the first number on each line of the trace is the core id; -- \#N denotes a request-id N; -- @T denotes a time T in clock cycles; -- hex numbers denote addresses; -- remaining decimal numbers denote values being loaded or stored; -- the value written by every store is unique (this simplifies trace checking and reasoning); -- this trace contains only loads, stores and responses, but the generator (and axe) also support LR/SC pairs, atomics, and fences. - - -We convert these traces to axe format using the -[toaxe.py](https://github.com/ucb-bar/groundtest/blob/master/scripts/toaxe.py) script. - -``` - > tracegen.py ./emulator-Top-TraceGenConfig 1 rv64ui-p-simple | toaxe.py - - # &M[2] == 0x0000000010 - # &M[0] == 0x0000000008 - # &M[3] == 0x0000000108 - # &M[1] == 0x0000100008 - 1: M[0] == 0 @ 64:96 - 1: M[1] := 5 @ 65: - 1: M[2] := 7 @ 66: - 0: M[0] := 2 @ 303: - 0: M[0] == 2 @ 304:351 - 0: M[1] := 6 @ 305: - 0: M[2] == 0 @ 353:424 - 1: M[3] == 0 @ 152:184 - ... -``` - -Main points: - -- lines begining # are comments, showing the addresses being used; -- after @ are the optional begin and end times of the operation. - -Axe traces can be validated using the [axe](https://github.com/CTSRD-CHERI/axe) tool (must be downloaded and installed seperately): -``` -> tracegen.py ./emulator-Top-TraceGenConfig 1 rv64ui-p-simple | toaxe.py - | axe check WMO - -OK -``` - -Axe reports that this trace is valid according to the WMO model. diff --git a/groundtest/build.sbt b/groundtest/build.sbt deleted file mode 100644 index 120a2611..00000000 --- a/groundtest/build.sbt +++ /dev/null @@ -1,10 +0,0 @@ -organization := "edu.berkeley.cs" - -version := "1.0" - -name := "groundtest" - -scalaVersion := "2.11.6" - -libraryDependencies ++= (Seq("chisel", "uncore", "junctions", "rocket").map { - dep: String => sys.props.get(dep + "Version") map { "edu.berkeley.cs" %% dep % _ }}).flatten diff --git a/junctions/.gitignore b/junctions/.gitignore deleted file mode 100644 index c58d83b3..00000000 --- a/junctions/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -*.class -*.log - -# sbt specific -.cache -.history -.lib/ -dist/* -target/ -lib_managed/ -src_managed/ -project/boot/ -project/plugins/project/ - -# Scala-IDE specific -.scala_dependencies -.worksheet diff --git a/junctions/LICENSE b/junctions/LICENSE deleted file mode 100644 index b226e9d5..00000000 --- a/junctions/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 2015, The Regents of the University of California (Regents) -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of junctions nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, -SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING -OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS -BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED -HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE -MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - diff --git a/junctions/README.md b/junctions/README.md deleted file mode 100644 index f88be666..00000000 --- a/junctions/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# junctions -A repository for peripheral components and IO devices associated with the RocketChip project. - -To uses these modules, include this repo as a git submodule within the your chip repository and add it as Project in your chip's build.scala. These components are only dependent on Chisel, i.e. - - lazy val junctions = project.dependsOn(chisel) diff --git a/junctions/build.sbt b/junctions/build.sbt deleted file mode 100644 index bae39ed9..00000000 --- a/junctions/build.sbt +++ /dev/null @@ -1,19 +0,0 @@ -organization := "edu.berkeley.cs" - -version := "1.0" - -name := "junctions" - -scalaVersion := "2.11.6" - -// Provide a managed dependency on chisel if -DchiselVersion="" is supplied on the command line. -libraryDependencies ++= (Seq("chisel","cde").map { - dep: String => sys.props.get(dep + "Version") map { "edu.berkeley.cs" %% dep % _ }}).flatten - -site.settings - -site.includeScaladoc() - -ghpages.settings - -git.remoteRepo := "git@github.com:ucb-bar/junctions.git" diff --git a/junctions/project/plugins.sbt b/junctions/project/plugins.sbt deleted file mode 100644 index 4f4825c4..00000000 --- a/junctions/project/plugins.sbt +++ /dev/null @@ -1,5 +0,0 @@ -resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" - -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3") - -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1") diff --git a/project/build.scala b/project/build.scala index 0d8349eb..c8944562 100644 --- a/project/build.scala +++ b/project/build.scala @@ -19,12 +19,7 @@ object BuildSettings extends Build { lazy val chisel = project in file("chisel3") lazy val cde = project in file("context-dependent-environments") lazy val hardfloat = project.dependsOn(chisel) - lazy val junctions = project.dependsOn(chisel, cde) - lazy val uncore = project.dependsOn(junctions) - lazy val rocket = project.dependsOn(hardfloat, uncore) - lazy val groundtest = project.dependsOn(rocket) - lazy val coreplex = project.dependsOn(groundtest) - lazy val rocketchip = (project in file(".")).settings(chipSettings).dependsOn(coreplex) + lazy val rocketchip = (project in file(".")).settings(chipSettings).dependsOn(chisel, cde, hardfloat) lazy val addons = settingKey[Seq[String]]("list of addons used for this build") lazy val make = inputKey[Unit]("trigger backend-specific makefile command") diff --git a/rocket/.gitignore b/rocket/.gitignore deleted file mode 100644 index eb5a316c..00000000 --- a/rocket/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target diff --git a/rocket/LICENSE b/rocket/LICENSE deleted file mode 100644 index 60e19fad..00000000 --- a/rocket/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2011-2014, The Regents of the University of California -(Regents). All Rights Reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of the Regents nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, -SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING -OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS -BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED -HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE -MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. diff --git a/rocket/README.md b/rocket/README.md deleted file mode 100644 index 72707989..00000000 --- a/rocket/README.md +++ /dev/null @@ -1,29 +0,0 @@ -Rocket Core -=========== - -Rocket is a 6-stage single-issue in-order pipeline that executes the 64-bit -scalar RISC-V ISA. Rocket implements an MMU that supports page-based virtual -memory and is able to boot modern operating systems such as Linux. Rocket -also has an optional IEEE 754-2008-compliant FPU, which implements both -single- and double-precision floating-point operations, including fused -multiply-add. - -This repository is not intended to be a self-running repository. To -instantiate a Rocket core, please use the Rocket chip generator found in the -rocket-chip git repository. - -The following table compares a 32-bit ARM Cortex-A5 core to a 64-bit RISC-V -Rocket core built in the same TSMC process (40GPLUS). Fourth column is the -ratio of RISC-V Rocket to ARM Cortex-A5. Both use single-instruction-issue, -in-order pipelines, yet the RISC-V core is faster, smaller, and uses less -power. - -ISA/Implementation | ARM Cortex-A5 | RISC-V Rocket | R/A ---- | --- | --- | --- -ISA Register Width | 32 bits | 64 bits | 2 -Frequency | >1 GHz | >1 GHz | 1 -Dhrystone Performance | 1.57 DMIPS/MHz | 1.72 DMIPS/MHz | 1.1 -Area excluding caches | 0.27 mm2 | 0.14 mm2 | 0.5 -Area with 16KB caches | 0.53 mm2 | 0.39 mm2 | 0.7 -Area Efficiency | 2.96 DMIPS/MHz/mm2 | 4.41 DMIPS/MHz/mm2 | 1.5 -Dynamic Power | <0.08 mW/MHz | 0.034 mW/MHz | >= 0.4 diff --git a/rocket/build.sbt b/rocket/build.sbt deleted file mode 100644 index 97c51700..00000000 --- a/rocket/build.sbt +++ /dev/null @@ -1,10 +0,0 @@ -organization := "edu.berkeley.cs" - -version := "1.2" - -name := "rocket" - -scalaVersion := "2.11.6" - -libraryDependencies ++= (Seq("chisel", "hardfloat", "uncore", "junctions", "cde").map { - dep: String => sys.props.get(dep + "Version") map { "edu.berkeley.cs" %% dep % _ }}).flatten diff --git a/coreplex/src/main/scala/Configs.scala b/src/main/scala/coreplex/Configs.scala similarity index 100% rename from coreplex/src/main/scala/Configs.scala rename to src/main/scala/coreplex/Configs.scala diff --git a/coreplex/src/main/scala/Coreplex.scala b/src/main/scala/coreplex/Coreplex.scala similarity index 100% rename from coreplex/src/main/scala/Coreplex.scala rename to src/main/scala/coreplex/Coreplex.scala diff --git a/coreplex/src/main/scala/DirectGroundTest.scala b/src/main/scala/coreplex/DirectGroundTest.scala similarity index 100% rename from coreplex/src/main/scala/DirectGroundTest.scala rename to src/main/scala/coreplex/DirectGroundTest.scala diff --git a/coreplex/src/main/scala/TestConfigs.scala b/src/main/scala/coreplex/TestConfigs.scala similarity index 100% rename from coreplex/src/main/scala/TestConfigs.scala rename to src/main/scala/coreplex/TestConfigs.scala diff --git a/coreplex/src/main/scala/Testing.scala b/src/main/scala/coreplex/Testing.scala similarity index 100% rename from coreplex/src/main/scala/Testing.scala rename to src/main/scala/coreplex/Testing.scala diff --git a/coreplex/src/main/scala/UnitTest.scala b/src/main/scala/coreplex/UnitTest.scala similarity index 100% rename from coreplex/src/main/scala/UnitTest.scala rename to src/main/scala/coreplex/UnitTest.scala diff --git a/groundtest/src/main/scala/BusMasterTest.scala b/src/main/scala/groundtest/BusMasterTest.scala similarity index 100% rename from groundtest/src/main/scala/BusMasterTest.scala rename to src/main/scala/groundtest/BusMasterTest.scala diff --git a/groundtest/src/main/scala/CacheFillTest.scala b/src/main/scala/groundtest/CacheFillTest.scala similarity index 100% rename from groundtest/src/main/scala/CacheFillTest.scala rename to src/main/scala/groundtest/CacheFillTest.scala diff --git a/groundtest/src/main/scala/Comparator.scala b/src/main/scala/groundtest/Comparator.scala similarity index 100% rename from groundtest/src/main/scala/Comparator.scala rename to src/main/scala/groundtest/Comparator.scala diff --git a/groundtest/src/main/scala/Generator.scala b/src/main/scala/groundtest/Generator.scala similarity index 100% rename from groundtest/src/main/scala/Generator.scala rename to src/main/scala/groundtest/Generator.scala diff --git a/groundtest/src/main/scala/NastiTest.scala b/src/main/scala/groundtest/NastiTest.scala similarity index 100% rename from groundtest/src/main/scala/NastiTest.scala rename to src/main/scala/groundtest/NastiTest.scala diff --git a/groundtest/src/main/scala/Regression.scala b/src/main/scala/groundtest/Regression.scala similarity index 100% rename from groundtest/src/main/scala/Regression.scala rename to src/main/scala/groundtest/Regression.scala diff --git a/groundtest/src/main/scala/Tile.scala b/src/main/scala/groundtest/Tile.scala similarity index 100% rename from groundtest/src/main/scala/Tile.scala rename to src/main/scala/groundtest/Tile.scala diff --git a/groundtest/src/main/scala/TraceGen.scala b/src/main/scala/groundtest/TraceGen.scala similarity index 100% rename from groundtest/src/main/scala/TraceGen.scala rename to src/main/scala/groundtest/TraceGen.scala diff --git a/groundtest/src/main/scala/Util.scala b/src/main/scala/groundtest/Util.scala similarity index 100% rename from groundtest/src/main/scala/Util.scala rename to src/main/scala/groundtest/Util.scala diff --git a/junctions/src/main/scala/addrmap.scala b/src/main/scala/junctions/addrmap.scala similarity index 100% rename from junctions/src/main/scala/addrmap.scala rename to src/main/scala/junctions/addrmap.scala diff --git a/junctions/src/main/scala/atos.scala b/src/main/scala/junctions/atos.scala similarity index 100% rename from junctions/src/main/scala/atos.scala rename to src/main/scala/junctions/atos.scala diff --git a/junctions/src/main/scala/crossing.scala b/src/main/scala/junctions/crossing.scala similarity index 100% rename from junctions/src/main/scala/crossing.scala rename to src/main/scala/junctions/crossing.scala diff --git a/junctions/src/main/scala/hasti.scala b/src/main/scala/junctions/hasti.scala similarity index 100% rename from junctions/src/main/scala/hasti.scala rename to src/main/scala/junctions/hasti.scala diff --git a/junctions/src/main/scala/memserdes.scala b/src/main/scala/junctions/memserdes.scala similarity index 100% rename from junctions/src/main/scala/memserdes.scala rename to src/main/scala/junctions/memserdes.scala diff --git a/junctions/src/main/scala/nasti.scala b/src/main/scala/junctions/nasti.scala similarity index 100% rename from junctions/src/main/scala/nasti.scala rename to src/main/scala/junctions/nasti.scala diff --git a/junctions/src/main/scala/package.scala b/src/main/scala/junctions/package.scala similarity index 100% rename from junctions/src/main/scala/package.scala rename to src/main/scala/junctions/package.scala diff --git a/junctions/src/main/scala/poci.scala b/src/main/scala/junctions/poci.scala similarity index 100% rename from junctions/src/main/scala/poci.scala rename to src/main/scala/junctions/poci.scala diff --git a/junctions/src/main/scala/slowio.scala b/src/main/scala/junctions/slowio.scala similarity index 100% rename from junctions/src/main/scala/slowio.scala rename to src/main/scala/junctions/slowio.scala diff --git a/junctions/src/main/scala/smi.scala b/src/main/scala/junctions/smi.scala similarity index 100% rename from junctions/src/main/scala/smi.scala rename to src/main/scala/junctions/smi.scala diff --git a/junctions/src/main/scala/stream.scala b/src/main/scala/junctions/stream.scala similarity index 100% rename from junctions/src/main/scala/stream.scala rename to src/main/scala/junctions/stream.scala diff --git a/junctions/src/main/scala/unittests/MiscNastiTests.scala b/src/main/scala/junctions/unittests/MiscNastiTests.scala similarity index 100% rename from junctions/src/main/scala/unittests/MiscNastiTests.scala rename to src/main/scala/junctions/unittests/MiscNastiTests.scala diff --git a/junctions/src/main/scala/unittests/MultiWidthFifoTest.scala b/src/main/scala/junctions/unittests/MultiWidthFifoTest.scala similarity index 100% rename from junctions/src/main/scala/unittests/MultiWidthFifoTest.scala rename to src/main/scala/junctions/unittests/MultiWidthFifoTest.scala diff --git a/junctions/src/main/scala/unittests/NastiDemuxTest.scala b/src/main/scala/junctions/unittests/NastiDemuxTest.scala similarity index 100% rename from junctions/src/main/scala/unittests/NastiDemuxTest.scala rename to src/main/scala/junctions/unittests/NastiDemuxTest.scala diff --git a/junctions/src/main/scala/unittests/UnitTest.scala b/src/main/scala/junctions/unittests/UnitTest.scala similarity index 100% rename from junctions/src/main/scala/unittests/UnitTest.scala rename to src/main/scala/junctions/unittests/UnitTest.scala diff --git a/junctions/src/main/scala/util.scala b/src/main/scala/junctions/util.scala similarity index 100% rename from junctions/src/main/scala/util.scala rename to src/main/scala/junctions/util.scala diff --git a/rocket/src/main/scala/arbiter.scala b/src/main/scala/rocket/arbiter.scala similarity index 100% rename from rocket/src/main/scala/arbiter.scala rename to src/main/scala/rocket/arbiter.scala diff --git a/rocket/src/main/scala/breakpoint.scala b/src/main/scala/rocket/breakpoint.scala similarity index 100% rename from rocket/src/main/scala/breakpoint.scala rename to src/main/scala/rocket/breakpoint.scala diff --git a/rocket/src/main/scala/btb.scala b/src/main/scala/rocket/btb.scala similarity index 100% rename from rocket/src/main/scala/btb.scala rename to src/main/scala/rocket/btb.scala diff --git a/rocket/src/main/scala/consts.scala b/src/main/scala/rocket/consts.scala similarity index 100% rename from rocket/src/main/scala/consts.scala rename to src/main/scala/rocket/consts.scala diff --git a/rocket/src/main/scala/csr.scala b/src/main/scala/rocket/csr.scala similarity index 100% rename from rocket/src/main/scala/csr.scala rename to src/main/scala/rocket/csr.scala diff --git a/rocket/src/main/scala/dcache.scala b/src/main/scala/rocket/dcache.scala similarity index 100% rename from rocket/src/main/scala/dcache.scala rename to src/main/scala/rocket/dcache.scala diff --git a/rocket/src/main/scala/decode.scala b/src/main/scala/rocket/decode.scala similarity index 100% rename from rocket/src/main/scala/decode.scala rename to src/main/scala/rocket/decode.scala diff --git a/rocket/src/main/scala/dpath_alu.scala b/src/main/scala/rocket/dpath_alu.scala similarity index 100% rename from rocket/src/main/scala/dpath_alu.scala rename to src/main/scala/rocket/dpath_alu.scala diff --git a/rocket/src/main/scala/fpu.scala b/src/main/scala/rocket/fpu.scala similarity index 100% rename from rocket/src/main/scala/fpu.scala rename to src/main/scala/rocket/fpu.scala diff --git a/rocket/src/main/scala/frontend.scala b/src/main/scala/rocket/frontend.scala similarity index 100% rename from rocket/src/main/scala/frontend.scala rename to src/main/scala/rocket/frontend.scala diff --git a/rocket/src/main/scala/ibuf.scala b/src/main/scala/rocket/ibuf.scala similarity index 100% rename from rocket/src/main/scala/ibuf.scala rename to src/main/scala/rocket/ibuf.scala diff --git a/rocket/src/main/scala/icache.scala b/src/main/scala/rocket/icache.scala similarity index 100% rename from rocket/src/main/scala/icache.scala rename to src/main/scala/rocket/icache.scala diff --git a/rocket/src/main/scala/idecode.scala b/src/main/scala/rocket/idecode.scala similarity index 100% rename from rocket/src/main/scala/idecode.scala rename to src/main/scala/rocket/idecode.scala diff --git a/rocket/src/main/scala/instructions.scala b/src/main/scala/rocket/instructions.scala similarity index 100% rename from rocket/src/main/scala/instructions.scala rename to src/main/scala/rocket/instructions.scala diff --git a/rocket/src/main/scala/multiplier.scala b/src/main/scala/rocket/multiplier.scala similarity index 100% rename from rocket/src/main/scala/multiplier.scala rename to src/main/scala/rocket/multiplier.scala diff --git a/rocket/src/main/scala/nbdcache.scala b/src/main/scala/rocket/nbdcache.scala similarity index 100% rename from rocket/src/main/scala/nbdcache.scala rename to src/main/scala/rocket/nbdcache.scala diff --git a/rocket/src/main/scala/package.scala b/src/main/scala/rocket/package.scala similarity index 100% rename from rocket/src/main/scala/package.scala rename to src/main/scala/rocket/package.scala diff --git a/rocket/src/main/scala/ptw.scala b/src/main/scala/rocket/ptw.scala similarity index 100% rename from rocket/src/main/scala/ptw.scala rename to src/main/scala/rocket/ptw.scala diff --git a/rocket/src/main/scala/rocc.scala b/src/main/scala/rocket/rocc.scala similarity index 100% rename from rocket/src/main/scala/rocc.scala rename to src/main/scala/rocket/rocc.scala diff --git a/rocket/src/main/scala/rocket.scala b/src/main/scala/rocket/rocket.scala similarity index 100% rename from rocket/src/main/scala/rocket.scala rename to src/main/scala/rocket/rocket.scala diff --git a/rocket/src/main/scala/rvc.scala b/src/main/scala/rocket/rvc.scala similarity index 100% rename from rocket/src/main/scala/rvc.scala rename to src/main/scala/rocket/rvc.scala diff --git a/rocket/src/main/scala/tile.scala b/src/main/scala/rocket/tile.scala similarity index 100% rename from rocket/src/main/scala/tile.scala rename to src/main/scala/rocket/tile.scala diff --git a/rocket/src/main/scala/tlb.scala b/src/main/scala/rocket/tlb.scala similarity index 100% rename from rocket/src/main/scala/tlb.scala rename to src/main/scala/rocket/tlb.scala diff --git a/rocket/src/main/scala/util.scala b/src/main/scala/rocket/util.scala similarity index 100% rename from rocket/src/main/scala/util.scala rename to src/main/scala/rocket/util.scala diff --git a/uncore/src/main/scala/Builder.scala b/src/main/scala/uncore/Builder.scala similarity index 100% rename from uncore/src/main/scala/Builder.scala rename to src/main/scala/uncore/Builder.scala diff --git a/uncore/src/main/scala/Consts.scala b/src/main/scala/uncore/Consts.scala similarity index 100% rename from uncore/src/main/scala/Consts.scala rename to src/main/scala/uncore/Consts.scala diff --git a/uncore/src/main/scala/Package.scala b/src/main/scala/uncore/Package.scala similarity index 100% rename from uncore/src/main/scala/Package.scala rename to src/main/scala/uncore/Package.scala diff --git a/uncore/src/main/scala/agents/Agents.scala b/src/main/scala/uncore/agents/Agents.scala similarity index 100% rename from uncore/src/main/scala/agents/Agents.scala rename to src/main/scala/uncore/agents/Agents.scala diff --git a/uncore/src/main/scala/agents/Broadcast.scala b/src/main/scala/uncore/agents/Broadcast.scala similarity index 100% rename from uncore/src/main/scala/agents/Broadcast.scala rename to src/main/scala/uncore/agents/Broadcast.scala diff --git a/uncore/src/main/scala/agents/Bufferless.scala b/src/main/scala/uncore/agents/Bufferless.scala similarity index 100% rename from uncore/src/main/scala/agents/Bufferless.scala rename to src/main/scala/uncore/agents/Bufferless.scala diff --git a/uncore/src/main/scala/agents/Cache.scala b/src/main/scala/uncore/agents/Cache.scala similarity index 100% rename from uncore/src/main/scala/agents/Cache.scala rename to src/main/scala/uncore/agents/Cache.scala diff --git a/uncore/src/main/scala/agents/Ecc.scala b/src/main/scala/uncore/agents/Ecc.scala similarity index 100% rename from uncore/src/main/scala/agents/Ecc.scala rename to src/main/scala/uncore/agents/Ecc.scala diff --git a/uncore/src/main/scala/agents/Mmio.scala b/src/main/scala/uncore/agents/Mmio.scala similarity index 100% rename from uncore/src/main/scala/agents/Mmio.scala rename to src/main/scala/uncore/agents/Mmio.scala diff --git a/uncore/src/main/scala/agents/StatelessBridge.scala b/src/main/scala/uncore/agents/StatelessBridge.scala similarity index 100% rename from uncore/src/main/scala/agents/StatelessBridge.scala rename to src/main/scala/uncore/agents/StatelessBridge.scala diff --git a/uncore/src/main/scala/agents/StoreDataQueue.scala b/src/main/scala/uncore/agents/StoreDataQueue.scala similarity index 100% rename from uncore/src/main/scala/agents/StoreDataQueue.scala rename to src/main/scala/uncore/agents/StoreDataQueue.scala diff --git a/uncore/src/main/scala/agents/Trackers.scala b/src/main/scala/uncore/agents/Trackers.scala similarity index 100% rename from uncore/src/main/scala/agents/Trackers.scala rename to src/main/scala/uncore/agents/Trackers.scala diff --git a/uncore/src/main/scala/coherence/Directory.scala b/src/main/scala/uncore/coherence/Directory.scala similarity index 100% rename from uncore/src/main/scala/coherence/Directory.scala rename to src/main/scala/uncore/coherence/Directory.scala diff --git a/uncore/src/main/scala/coherence/Metadata.scala b/src/main/scala/uncore/coherence/Metadata.scala similarity index 100% rename from uncore/src/main/scala/coherence/Metadata.scala rename to src/main/scala/uncore/coherence/Metadata.scala diff --git a/uncore/src/main/scala/coherence/Policies.scala b/src/main/scala/uncore/coherence/Policies.scala similarity index 100% rename from uncore/src/main/scala/coherence/Policies.scala rename to src/main/scala/uncore/coherence/Policies.scala diff --git a/uncore/src/main/scala/converters/Ahb.scala b/src/main/scala/uncore/converters/Ahb.scala similarity index 100% rename from uncore/src/main/scala/converters/Ahb.scala rename to src/main/scala/uncore/converters/Ahb.scala diff --git a/uncore/src/main/scala/converters/Nasti.scala b/src/main/scala/uncore/converters/Nasti.scala similarity index 100% rename from uncore/src/main/scala/converters/Nasti.scala rename to src/main/scala/uncore/converters/Nasti.scala diff --git a/uncore/src/main/scala/converters/Smi.scala b/src/main/scala/uncore/converters/Smi.scala similarity index 100% rename from uncore/src/main/scala/converters/Smi.scala rename to src/main/scala/uncore/converters/Smi.scala diff --git a/uncore/src/main/scala/converters/Tilelink.scala b/src/main/scala/uncore/converters/Tilelink.scala similarity index 100% rename from uncore/src/main/scala/converters/Tilelink.scala rename to src/main/scala/uncore/converters/Tilelink.scala diff --git a/uncore/src/main/scala/devices/Bram.scala b/src/main/scala/uncore/devices/Bram.scala similarity index 100% rename from uncore/src/main/scala/devices/Bram.scala rename to src/main/scala/uncore/devices/Bram.scala diff --git a/uncore/src/main/scala/devices/Debug.scala b/src/main/scala/uncore/devices/Debug.scala similarity index 100% rename from uncore/src/main/scala/devices/Debug.scala rename to src/main/scala/uncore/devices/Debug.scala diff --git a/uncore/src/main/scala/devices/Plic.scala b/src/main/scala/uncore/devices/Plic.scala similarity index 100% rename from uncore/src/main/scala/devices/Plic.scala rename to src/main/scala/uncore/devices/Plic.scala diff --git a/uncore/src/main/scala/devices/Prci.scala b/src/main/scala/uncore/devices/Prci.scala similarity index 100% rename from uncore/src/main/scala/devices/Prci.scala rename to src/main/scala/uncore/devices/Prci.scala diff --git a/uncore/src/main/scala/devices/Rom.scala b/src/main/scala/uncore/devices/Rom.scala similarity index 100% rename from uncore/src/main/scala/devices/Rom.scala rename to src/main/scala/uncore/devices/Rom.scala diff --git a/uncore/src/main/scala/tilelink/Arbiters.scala b/src/main/scala/uncore/tilelink/Arbiters.scala similarity index 100% rename from uncore/src/main/scala/tilelink/Arbiters.scala rename to src/main/scala/uncore/tilelink/Arbiters.scala diff --git a/uncore/src/main/scala/tilelink/Definitions.scala b/src/main/scala/uncore/tilelink/Definitions.scala similarity index 100% rename from uncore/src/main/scala/tilelink/Definitions.scala rename to src/main/scala/uncore/tilelink/Definitions.scala diff --git a/uncore/src/main/scala/tilelink/Interconnect.scala b/src/main/scala/uncore/tilelink/Interconnect.scala similarity index 100% rename from uncore/src/main/scala/tilelink/Interconnect.scala rename to src/main/scala/uncore/tilelink/Interconnect.scala diff --git a/uncore/src/main/scala/tilelink/Network.scala b/src/main/scala/uncore/tilelink/Network.scala similarity index 100% rename from uncore/src/main/scala/tilelink/Network.scala rename to src/main/scala/uncore/tilelink/Network.scala diff --git a/uncore/src/main/scala/unittests/Drivers.scala b/src/main/scala/uncore/unittests/Drivers.scala similarity index 100% rename from uncore/src/main/scala/unittests/Drivers.scala rename to src/main/scala/uncore/unittests/Drivers.scala diff --git a/uncore/src/main/scala/unittests/Tests.scala b/src/main/scala/uncore/unittests/Tests.scala similarity index 100% rename from uncore/src/main/scala/unittests/Tests.scala rename to src/main/scala/uncore/unittests/Tests.scala diff --git a/uncore/src/main/scala/util/AmoAlu.scala b/src/main/scala/uncore/util/AmoAlu.scala similarity index 100% rename from uncore/src/main/scala/util/AmoAlu.scala rename to src/main/scala/uncore/util/AmoAlu.scala diff --git a/uncore/src/main/scala/util/Counters.scala b/src/main/scala/uncore/util/Counters.scala similarity index 100% rename from uncore/src/main/scala/util/Counters.scala rename to src/main/scala/uncore/util/Counters.scala diff --git a/uncore/src/main/scala/util/Enqueuer.scala b/src/main/scala/uncore/util/Enqueuer.scala similarity index 100% rename from uncore/src/main/scala/util/Enqueuer.scala rename to src/main/scala/uncore/util/Enqueuer.scala diff --git a/uncore/src/main/scala/util/Package.scala b/src/main/scala/uncore/util/Package.scala similarity index 100% rename from uncore/src/main/scala/util/Package.scala rename to src/main/scala/uncore/util/Package.scala diff --git a/uncore/src/main/scala/util/Serializer.scala b/src/main/scala/uncore/util/Serializer.scala similarity index 100% rename from uncore/src/main/scala/util/Serializer.scala rename to src/main/scala/uncore/util/Serializer.scala diff --git a/uncore/.gitignore b/uncore/.gitignore deleted file mode 100644 index 555feb41..00000000 --- a/uncore/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -target/ -project/target/ diff --git a/uncore/LICENSE b/uncore/LICENSE deleted file mode 100644 index 7cff15e4..00000000 --- a/uncore/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2012-2014, The Regents of the University of California -(Regents). All Rights Reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of the Regents nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, -SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING -OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS -BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED -HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE -MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. diff --git a/uncore/README.md b/uncore/README.md deleted file mode 100644 index 3a628a24..00000000 --- a/uncore/README.md +++ /dev/null @@ -1,12 +0,0 @@ -Uncore Library -============== - -This is the repository for uncore components assosciated with Rocket chip -project. To uses these modules, include this repo as a git submodule within -the your chip repository and add it as a project in your chip's build.scala. -These components are only dependent on the ucb-bar/chisel repo, i.e. - - lazy val uncore = project.dependsOn(chisel) - -ScalaDoc for the uncore library is available here -and an overview of the TileLink Protocol is available here, with associated CoherencePolicy documentation here. diff --git a/uncore/build.sbt b/uncore/build.sbt deleted file mode 100644 index 120670b5..00000000 --- a/uncore/build.sbt +++ /dev/null @@ -1,19 +0,0 @@ -organization := "edu.berkeley.cs" - -version := "2.0" - -name := "uncore" - -scalaVersion := "2.11.6" - -// Provide a managed dependency on X if -DXVersion="" is supplied on the command line. -libraryDependencies ++= (Seq("chisel","junctions","cde").map { - dep: String => sys.props.get(dep + "Version") map { "edu.berkeley.cs" %% dep % _ }}).flatten - -site.settings - -site.includeScaladoc() - -ghpages.settings - -git.remoteRepo := "git@github.com:ucb-bar/uncore.git" diff --git a/uncore/project/plugins.sbt b/uncore/project/plugins.sbt deleted file mode 100644 index 4f4825c4..00000000 --- a/uncore/project/plugins.sbt +++ /dev/null @@ -1,5 +0,0 @@ -resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" - -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3") - -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")