From 864b2338d76c809163c0d827bad386b6ad45b606 Mon Sep 17 00:00:00 2001 From: Donggyu Kim Date: Wed, 24 Sep 2014 01:52:25 -0700 Subject: [PATCH] [MIDAS] fix Makefile --- Makefile | 17 ++++++++--------- src/main/scala/main.scala | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c8b9a9d5..cf0df82f 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,19 @@ gendir := generated tutdir := tutorial/examples -designs := $(filter-out examples Image Sound,\ - $(notdir $(basename $(wildcard $(tutdir)/*.scala)))) -VPATH := $(tutdir):$(generated) +designs := GCD +VPATH := $(tutdir):$(gendir) -C_FLAGS := --targetDir $(gendir) --genHarness --compile --test --vcd --debug -V_FLAGS := $(C_FLAGS) --v +C_FLAGS := --targetDir $(gendir) --genHarness --compile --test --vcd --debug +V_FLAGS := $(C_FLAGS) --v all : cpp v -cpp : $(addsuffix .cpp, $(designs)) -v : $(addsuffix .v, $(designs)) +cpp : $(addsuffix Wrapper.cpp, $(designs)) +v : $(addsuffix Wrapper.v, $(designs)) -%.cpp: %.scala +%Wrapper.cpp: %.scala sbt "run $(basename $@) $(C_FLAGS)" | tee $@.out -%.v: %.scala +%Wrapper.v: %.scala sbt "run $(basename $@) $(V_FLAGS)" | tee $@.out clean: diff --git a/src/main/scala/main.scala b/src/main/scala/main.scala index ab0b38b4..4ce0d056 100644 --- a/src/main/scala/main.scala +++ b/src/main/scala/main.scala @@ -7,7 +7,7 @@ object FAEE { def main(args: Array[String]) { val chiselArgs = args.slice(1, args.length) val res = args(0) match { - case "GCD" => + case "GCDWrapper" => chiselMainTest(chiselArgs, () => DaisyWrapper(new GCD))( c => new GCDDaisyTests(c)) case _ =>