From f4a7e53abe314ad28397aae208287998fce4fa1a Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 11 May 2015 09:47:48 -0700
Subject: Updated versions; add Makefile Updated Scala (2.11.6) and Chisel
 (3.0) versions. Add chisel2 Makefile

---
 Makefile | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 Makefile

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..485e0f7a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,64 @@
+SBT		?= sbt
+SBT_FLAGS	?= -Dsbt.log.noformat=true
+RM_DIRS 	:= test-outputs test-reports
+CLEAN_DIRS	:= doc
+
+SRC_DIR	?= .
+SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1
+CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-3.0-SNAPSHOT.jar
+DRIVER	   ?= $(SRC_DIR)/src/test/resources/AddFilterSysCdriver.cpp
+TEST_OUTPUT_DIR ?= ./test-outputs
+
+.PHONY:	smoke publish-local check clean jenkins-build sysctest coverage scaladoc test
+
+default:	publish-local
+
+smoke:
+	$(SBT) $(SBT_FLAGS) compile
+
+publish-local:
+	$(SBT) $(SBT_FLAGS) publish-local
+
+check test:
+	$(SBT) $(SBT_FLAGS) test
+
+coverage:
+	$(SBT) $(SBT_FLAGS) coverage test
+	$(SBT) $(SBT_FLAGS) coverageReport
+
+clean:
+	$(SBT) $(SBT_FLAGS) +clean
+	for dir in $(CLEAN_DIRS); do $(MAKE) -C $$dir clean; done
+	$(RM) -r $(RM_DIRS)
+
+scaladoc:
+	$(SBT) $(SBT_FLAGS) doc test:doc
+
+# Start off clean, then run tests for all supported configurations, and publish those versions of the code.
+# Then run coverage and style tests (for developer's use).
+# Don't publish the coverage test code since it contains hooks/references to the coverage test package
+# and we don't want code with those dependencies published.
+# We need to run the coverage tests last, since Jenkins will fail the build if it can't find their results.
+jenkins-build: clean
+	$(SBT) $(SBT_FLAGS) +test
+	$(SBT) $(SBT_FLAGS) +clean +publish-local
+	$(SBT) $(SBT_FLAGS) scalastyle coverage test
+	$(SBT) $(SBT_FLAGS) coverageReport
+
+sysctest:
+	mkdir -p $(TEST_OUTPUT_DIR)
+	$(MAKE) -C $(TEST_OUTPUT_DIR) -f ../Makefile SRC_DIR=.. syscbuildandruntest
+
+syscbuildandruntest:	AddFilter
+	./AddFilter
+
+AddFilter:	AddFilter.h AddFilter.cpp $(SYSC_DRIVER)
+	$(CXX)  AddFilter.cpp $(DRIVER) \
+	   -I. -I$(SYSTEMC)/include -L$(SYSTEMC)/lib-macosx64 -lsystemc -o $@
+
+AddFilter.cpp AddFilter.h:	   AddFilter.class
+	scala -cp $(CHISEL_JAR):. AddFilter --targetDir . --genHarness --backend sysc --design AddFilter
+
+AddFilter.class:  $(CHISEL_JAR) ../src/test/scala/AddFilter.scala
+	scalac -cp $(CHISEL_JAR) ../src/test/scala/AddFilter.scala
+
-- 
cgit v1.2.3


From caa7602b878c03c47fd263550e37715f1a67f854 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 11 May 2015 10:01:49 -0700
Subject: Clean up make clean.

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 485e0f7a..a4e0f62d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 SBT		?= sbt
 SBT_FLAGS	?= -Dsbt.log.noformat=true
 RM_DIRS 	:= test-outputs test-reports
-CLEAN_DIRS	:= doc
+#CLEAN_DIRS	:= doc
 
 SRC_DIR	?= .
 SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1
@@ -28,8 +28,12 @@ coverage:
 
 clean:
 	$(SBT) $(SBT_FLAGS) +clean
+ifneq (,$(CLEAN_DIRS))
 	for dir in $(CLEAN_DIRS); do $(MAKE) -C $$dir clean; done
+endif
+ifneq (,$(RM_DIRS))
 	$(RM) -r $(RM_DIRS)
+endif
 
 scaladoc:
 	$(SBT) $(SBT_FLAGS) doc test:doc
-- 
cgit v1.2.3


From 2ae50411cbc5e2cd5fdc9ca4069b9c5f64919bc4 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 11 May 2015 13:02:03 -0700
Subject: Incorporate chisel3-tests; update Makefile.

---
 Makefile | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a4e0f62d..db3b6a3d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,25 @@ SBT_FLAGS	?= -Dsbt.log.noformat=true
 RM_DIRS 	:= test-outputs test-reports
 #CLEAN_DIRS	:= doc
 
+# If a chiselVersion is defined, use that.
+# Otherwise, use the snapshot.
+ifneq (,$(chiselVersion))
+SBT_FLAGS += -DchiselVersion="$(chiselVersion)"
+else
+SBT_FLAGS += -DchiselVersion="3.0-SNAPSHOT"
+endif
+
 SRC_DIR	?= .
 SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1
 CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-3.0-SNAPSHOT.jar
 DRIVER	   ?= $(SRC_DIR)/src/test/resources/AddFilterSysCdriver.cpp
 TEST_OUTPUT_DIR ?= ./test-outputs
 
+test_src_dir := src/test/scala/ChiselTests
+test_results := $(notdir $(basename $(filter-out main,$(wildcard $(test_src_dir)/*.scala))))
+
+test_outs    := $(addprefix generated/, $(addsuffix .out, $(test_results)))
+
 .PHONY:	smoke publish-local check clean jenkins-build sysctest coverage scaladoc test
 
 default:	publish-local
@@ -19,9 +32,11 @@ smoke:
 publish-local:
 	$(SBT) $(SBT_FLAGS) publish-local
 
-check test:
+test:
 	$(SBT) $(SBT_FLAGS) test
 
+check:	test $(test_outs)
+
 coverage:
 	$(SBT) $(SBT_FLAGS) coverage test
 	$(SBT) $(SBT_FLAGS) coverageReport
@@ -66,3 +81,11 @@ AddFilter.cpp AddFilter.h:	   AddFilter.class
 AddFilter.class:  $(CHISEL_JAR) ../src/test/scala/AddFilter.scala
 	scalac -cp $(CHISEL_JAR) ../src/test/scala/AddFilter.scala
 
+generated/%.fir: $(test_src_dir)/%.scala
+	$(SBT) $(SBT_FLAGS) "test:runMain ChiselTests.MiniChisel $(notdir $(basename $<)) $(CHISEL_FLAGS)"
+
+generated/%.flo: generated/%.fir
+	./bin/fir2flo.sh $< > $@
+
+generated/%.out: generated/%.flo
+	./bin/flo-app.sh $< > $@
-- 
cgit v1.2.3


From e74cce036a7e9f8a08a020f1e007b22098db890d Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Tue, 12 May 2015 15:19:55 -0700
Subject: Use CHISEL_BIN, CX, generalize generated/targetDir, convert filter to
 python, cd into targetDir before launching simulator (via Driver).

---
 Makefile | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index db3b6a3d..3371163f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 SBT		?= sbt
 SBT_FLAGS	?= -Dsbt.log.noformat=true
-RM_DIRS 	:= test-outputs test-reports
-#CLEAN_DIRS	:= doc
 
 # If a chiselVersion is defined, use that.
 # Otherwise, use the snapshot.
@@ -15,12 +13,18 @@ SRC_DIR	?= .
 SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1
 CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-3.0-SNAPSHOT.jar
 DRIVER	   ?= $(SRC_DIR)/src/test/resources/AddFilterSysCdriver.cpp
+# The targetDir will be rm -rf'ed when "make clean"
+targetDir ?= ./generated
+# The TEST_OUTPUT_DIR will be rm -rf'ed when "make clean"
 TEST_OUTPUT_DIR ?= ./test-outputs
+RM_DIRS 	:= $(TEST_OUTPUT_DIR) test-reports $(targetDir)
+#CLEAN_DIRS	:= doc
 
 test_src_dir := src/test/scala/ChiselTests
-test_results := $(notdir $(basename $(filter-out main,$(wildcard $(test_src_dir)/*.scala))))
+test_results := $(filter-out main,$(notdir $(basename $(wildcard $(test_src_dir)/*.scala))))
+c_resources_dir := src/main/resources
 
-test_outs    := $(addprefix generated/, $(addsuffix .out, $(test_results)))
+test_outs    := $(addprefix $(targetDir)/, $(addsuffix .out, $(test_results)))
 
 .PHONY:	smoke publish-local check clean jenkins-build sysctest coverage scaladoc test
 
@@ -81,11 +85,17 @@ AddFilter.cpp AddFilter.h:	   AddFilter.class
 AddFilter.class:  $(CHISEL_JAR) ../src/test/scala/AddFilter.scala
 	scalac -cp $(CHISEL_JAR) ../src/test/scala/AddFilter.scala
 
-generated/%.fir: $(test_src_dir)/%.scala
+$(targetDir)/%.fir: $(test_src_dir)/%.scala
 	$(SBT) $(SBT_FLAGS) "test:runMain ChiselTests.MiniChisel $(notdir $(basename $<)) $(CHISEL_FLAGS)"
 
-generated/%.flo: generated/%.fir
-	./bin/fir2flo.sh $< > $@
+$(targetDir)/%.flo: $(targetDir)/%.fir
+	$(CHISEL_BIN)/fir2flo.sh $(targetDir)/$*
+
+$(targetDir)/%: $(targetDir)/%.flo $(targetDir)/emulator.h $(targetDir)/emulator_mod.h $(targetDir)/emulator_api.h
+	(cd $(targetDir); $(CHISEL_BIN)/flo2app.sh $*)
+
+$(targetDir)/%.h:	$(c_resources_dir)/%.h
+	cp $< $@
 
-generated/%.out: generated/%.flo
-	./bin/flo-app.sh $< > $@
+$(targetDir)/%.out:	$(targetDir)/%
+	$(SBT) $(SBT_FLAGS) "test:runMain ChiselTests.MiniChisel $(notdir $(basename $<)) $(CHISEL_FLAGS) --test --targetDir $(targetDir)"
-- 
cgit v1.2.3


From 9ff6673f54b18386fd205eeb8be8d3c21a40fdca Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 13 Jul 2015 10:21:48 -0700
Subject: Generalize, add missing chisel2 meta files.

---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3371163f..d56e9610 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ SBT_FLAGS += -DchiselVersion="3.0-SNAPSHOT"
 endif
 
 SRC_DIR	?= .
+CHISEL_BIN ?= $(SRC_DIR)/bin
+export CHISEL_BIN
+
 SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1
 CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-3.0-SNAPSHOT.jar
 DRIVER	   ?= $(SRC_DIR)/src/test/resources/AddFilterSysCdriver.cpp
@@ -34,7 +37,7 @@ smoke:
 	$(SBT) $(SBT_FLAGS) compile
 
 publish-local:
-	$(SBT) $(SBT_FLAGS) publish-local
+	$(SBT) $(SBT_FLAGS) +publish-local
 
 test:
 	$(SBT) $(SBT_FLAGS) test
-- 
cgit v1.2.3


From 6c42f2560557ede48d9da0b8b63a6dc7a5e56d18 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Thu, 16 Jul 2015 14:14:01 -0700
Subject: Remove chiselVersion from Makefile; correct bit order for toBits;
 correct Vec() factory signature; Builder.pushCommands in test to avoid empty
 list head if tester manipulates Chisel nodes.

---
 Makefile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d56e9610..ec8e9c3e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,16 @@
 SBT		?= sbt
 SBT_FLAGS	?= -Dsbt.log.noformat=true
 
-# If a chiselVersion is defined, use that.
-# Otherwise, use the snapshot.
-ifneq (,$(chiselVersion))
-SBT_FLAGS += -DchiselVersion="$(chiselVersion)"
-else
-SBT_FLAGS += -DchiselVersion="3.0-SNAPSHOT"
-endif
+CHISEL_VERSION := $(shell "$(SBT)" $(SBT_FLAGS) "show version" | tail -n 1 | cut -d ' ' -f 2)
 
 SRC_DIR	?= .
 CHISEL_BIN ?= $(SRC_DIR)/bin
 export CHISEL_BIN
 
+$(info Build Chisel $(CHISEL_VERSION))
+
 SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1
-CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-3.0-SNAPSHOT.jar
+CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-$(CHISEL_VERSION).jar
 DRIVER	   ?= $(SRC_DIR)/src/test/resources/AddFilterSysCdriver.cpp
 # The targetDir will be rm -rf'ed when "make clean"
 targetDir ?= ./generated
-- 
cgit v1.2.3


From 80774333d08405fe726101405192493e0a7b3cf2 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 20 Jul 2015 08:21:17 -0700
Subject: Comment out (probably expensive) reference to CHISEL_VERSION.

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ec8e9c3e..87cdcced 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 SBT		?= sbt
 SBT_FLAGS	?= -Dsbt.log.noformat=true
 
-CHISEL_VERSION := $(shell "$(SBT)" $(SBT_FLAGS) "show version" | tail -n 1 | cut -d ' ' -f 2)
+CHISEL_VERSION = $(shell "$(SBT)" $(SBT_FLAGS) "show version" | tail -n 1 | cut -d ' ' -f 2)
 
 SRC_DIR	?= .
 CHISEL_BIN ?= $(SRC_DIR)/bin
 export CHISEL_BIN
 
-$(info Build Chisel $(CHISEL_VERSION))
+#$(info Build Chisel $(CHISEL_VERSION))
 
 SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1
 CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-$(CHISEL_VERSION).jar
-- 
cgit v1.2.3


From aae03a4e09aef90cd6e924ea9f62e8fd04b4de37 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Thu, 23 Jul 2015 09:14:15 -0700
Subject: Preserve secondary files; use abspath for bin dir.

---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 87cdcced..b328b6d9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
+# Retain all intermediate files.
+.SECONDARY:
+
 SBT		?= sbt
 SBT_FLAGS	?= -Dsbt.log.noformat=true
 
 CHISEL_VERSION = $(shell "$(SBT)" $(SBT_FLAGS) "show version" | tail -n 1 | cut -d ' ' -f 2)
 
 SRC_DIR	?= .
-CHISEL_BIN ?= $(SRC_DIR)/bin
+CHISEL_BIN ?= $(abspath $(SRC_DIR)/bin)
 export CHISEL_BIN
 
 #$(info Build Chisel $(CHISEL_VERSION))
-- 
cgit v1.2.3


From 3976145bb8c7595ad0f0a7fbb4ccbbd3030d8873 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Fri, 24 Jul 2015 15:25:28 -0700
Subject: Remove SystemC rules (premature); filter out failing tests.

---
 Makefile | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b328b6d9..fa607649 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,6 @@ export CHISEL_BIN
 
 #$(info Build Chisel $(CHISEL_VERSION))
 
-SYSTEMC ?= $(SRC_DIR)/../../systemc/systemc-2.3.1
-CHISEL_JAR ?= $(SRC_DIR)/target/scala-2.11/chisel_2.11-$(CHISEL_VERSION).jar
-DRIVER	   ?= $(SRC_DIR)/src/test/resources/AddFilterSysCdriver.cpp
 # The targetDir will be rm -rf'ed when "make clean"
 targetDir ?= ./generated
 # The TEST_OUTPUT_DIR will be rm -rf'ed when "make clean"
@@ -23,12 +20,12 @@ RM_DIRS 	:= $(TEST_OUTPUT_DIR) test-reports $(targetDir)
 #CLEAN_DIRS	:= doc
 
 test_src_dir := src/test/scala/ChiselTests
-test_results := $(filter-out main,$(notdir $(basename $(wildcard $(test_src_dir)/*.scala))))
+test_results := $(filter-out main DirChange Pads SIntOps,$(notdir $(basename $(wildcard $(test_src_dir)/*.scala))))
 c_resources_dir := src/main/resources
 
 test_outs    := $(addprefix $(targetDir)/, $(addsuffix .out, $(test_results)))
 
-.PHONY:	smoke publish-local check clean jenkins-build sysctest coverage scaladoc test
+.PHONY:	smoke publish-local check clean jenkins-build coverage scaladoc test
 
 default:	publish-local
 
@@ -70,23 +67,6 @@ jenkins-build: clean
 	$(SBT) $(SBT_FLAGS) scalastyle coverage test
 	$(SBT) $(SBT_FLAGS) coverageReport
 
-sysctest:
-	mkdir -p $(TEST_OUTPUT_DIR)
-	$(MAKE) -C $(TEST_OUTPUT_DIR) -f ../Makefile SRC_DIR=.. syscbuildandruntest
-
-syscbuildandruntest:	AddFilter
-	./AddFilter
-
-AddFilter:	AddFilter.h AddFilter.cpp $(SYSC_DRIVER)
-	$(CXX)  AddFilter.cpp $(DRIVER) \
-	   -I. -I$(SYSTEMC)/include -L$(SYSTEMC)/lib-macosx64 -lsystemc -o $@
-
-AddFilter.cpp AddFilter.h:	   AddFilter.class
-	scala -cp $(CHISEL_JAR):. AddFilter --targetDir . --genHarness --backend sysc --design AddFilter
-
-AddFilter.class:  $(CHISEL_JAR) ../src/test/scala/AddFilter.scala
-	scalac -cp $(CHISEL_JAR) ../src/test/scala/AddFilter.scala
-
 $(targetDir)/%.fir: $(test_src_dir)/%.scala
 	$(SBT) $(SBT_FLAGS) "test:runMain ChiselTests.MiniChisel $(notdir $(basename $<)) $(CHISEL_FLAGS)"
 
-- 
cgit v1.2.3