From 76046c52fe6e159a6cd629a4ede3e4598f115c31 Mon Sep 17 00:00:00 2001
From: Henry Cook <hcook@eecs.berkeley.edu>
Date: Mon, 13 Jul 2015 18:56:18 -0700
Subject: [PATCH] Cleanup testing rv64uf

---
 src/main/scala/Configs.scala | 14 +++++++++-----
 src/main/scala/Testing.scala |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index 8dc30a22..51815e1e 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -80,10 +80,9 @@ class DefaultConfig extends ChiselConfig (
         Module(new L2BroadcastHub, { case InnerTLId => "L1ToL2"; case OuterTLId => "L2ToMC" })
       //Tile Constants
       case BuildTiles => {
-        TestGeneration.addSuites(rv64.map(_("p")) ++ rv64u.map(_("pt")) ++ List(bmarks))
-        if(site(UseVM)) TestGeneration.addSuites(rv64u.map(_("v")))
-        if(!site(FDivSqrt)) TestGeneration.addSuites(List(rv64ufNoDiv("p"), rv64ufNoDiv("pt")))
-        if(site(NTiles) > 1) TestGeneration.addSuite(mtBmarks)
+        TestGeneration.addSuites(rv64i.map(_("p")))
+        TestGeneration.addSuites((if(site(UseVM)) List("pt","v") else List("pt")).flatMap(env => rv64u.map(_(env))))
+        TestGeneration.addSuites(if(site(NTiles) > 1) List(mtBmarks, bmarks) else List(bmarks))
         List.fill(site(NTiles)){ (r:Bool) => Module(new RocketTile(resetSignal = r), {case TLId => "L1ToL2"}) }
       }
       case BuildRoCC => None
@@ -98,7 +97,12 @@ class DefaultConfig extends ChiselConfig (
       case FastMulDiv => true
       case XLen => 64
       case NMultXpr => 32
-      case BuildFPU => Some(() => Module(new FPU))
+      case BuildFPU => {
+        val env = if(site(UseVM)) List("p","pt","v") else List("p","pt")
+        if(site(FDivSqrt)) TestGeneration.addSuites(env.map(rv64uf))
+        else TestGeneration.addSuites(env.map(rv64ufNoDiv))
+        Some(() => Module(new FPU))
+      }
       case FDivSqrt => true
       case SFMALatency => 2
       case DFMALatency => 3
diff --git a/src/main/scala/Testing.scala b/src/main/scala/Testing.scala
index 67fd6917..9edb4c3c 100644
--- a/src/main/scala/Testing.scala
+++ b/src/main/scala/Testing.scala
@@ -106,8 +106,8 @@ object DefaultTestSuites {
 
   // TODO: "rv64ui-pm-lrsc", "rv64mi-pm-ipi",
 
-  val rv64u = List(rv64ui, rv64um, rv64ua, rv64uf)
-  val rv64 = rv64u ++ List(rv64si, rv64mi)
+  val rv64u = List(rv64ui, rv64um, rv64ua)
+  val rv64i = List(rv64ui, rv64si, rv64mi)
 
   val bmarks = new BenchmarkTestSuite("basic", "$(base_dir)/riscv-tools/riscv-tests/benchmarks", Set(
     "median", "multiply", "qsort", "towers", "vvadd", "mm", "dhrystone", "spmv", "mt-vvadd", "mt-matmul"))