From eb9cdca50d1b735263d3b5925cabf5a5f1e1454d Mon Sep 17 00:00:00 2001 From: Ludovic Jacomme Date: Sun, 23 May 2004 22:15:31 +0000 Subject: [PATCH] - verbose mode for NERO --- .../alliance-examples/addaccu16/Makefile | 2 +- .../alliance-examples/adder4/Makefile | 2 +- .../alliance-examples/amd2901-vasy/Makefile | 2 +- .../alliance-examples/amd2901/Makefile | 2 +- .../alliance-examples/hadamard/Makefile | 16 +++------------- .../alliance-examples/multi16b-reg/Makefile | 12 ++++-------- .../alliance-examples/multi4b/Makefile | 2 +- .../alliance-examples/multi8/Makefile | 2 +- .../alliance-examples/multi8b/Makefile | 4 ++-- .../alliance-examples/pgcd/Makefile | 2 +- 10 files changed, 16 insertions(+), 30 deletions(-) diff --git a/alliance/src/documentation/alliance-examples/addaccu16/Makefile b/alliance/src/documentation/alliance-examples/addaccu16/Makefile index bdde514a..0a51974f 100644 --- a/alliance/src/documentation/alliance-examples/addaccu16/Makefile +++ b/alliance/src/documentation/alliance-examples/addaccu16/Makefile @@ -221,7 +221,7 @@ addaccu_p.ap : res_synth_1.pat # \------------------------------------------------------------*/ addaccu.ap : addaccu_p.ap addaccu.vst - $(ENV_NERO); $(NERO) -v -$(METAL_LEVEL) -p addaccu_p addaccu addaccu + $(ENV_NERO); $(NERO) -V -$(METAL_LEVEL) -p addaccu_p addaccu addaccu # /*------------------------------------------------------------\ # | | diff --git a/alliance/src/documentation/alliance-examples/adder4/Makefile b/alliance/src/documentation/alliance-examples/adder4/Makefile index a2001fab..5028c4d8 100644 --- a/alliance/src/documentation/alliance-examples/adder4/Makefile +++ b/alliance/src/documentation/alliance-examples/adder4/Makefile @@ -221,7 +221,7 @@ adder4_p.ap : res_synth_1.pat # \------------------------------------------------------------*/ adder4.ap : adder4_p.ap adder4.vst - $(ENV_NERO); $(NERO) -v -$(METAL_LEVEL) -p adder4_p adder4 adder4 + $(ENV_NERO); $(NERO) -V -$(METAL_LEVEL) -p adder4_p adder4 adder4 # /*------------------------------------------------------------\ # | | diff --git a/alliance/src/documentation/alliance-examples/amd2901-vasy/Makefile b/alliance/src/documentation/alliance-examples/amd2901-vasy/Makefile index fbdaf3d7..f8f575be 100644 --- a/alliance/src/documentation/alliance-examples/amd2901-vasy/Makefile +++ b/alliance/src/documentation/alliance-examples/amd2901-vasy/Makefile @@ -223,7 +223,7 @@ amd2901_p.ap : res_synth_1.pat # $(ENV_OCR); $(OCR) -v -l $(METAL_LEVEL) -L amd2901 -P amd2901_p -O amd2901 amd2901.ap : amd2901_p.ap amd2901.vst - $(ENV_OCR); $(NERO) -v -$(METAL_LEVEL) -p amd2901_p amd2901 amd2901 + $(ENV_OCR); $(NERO) -V -$(METAL_LEVEL) -p amd2901_p amd2901 amd2901 # /*------------------------------------------------------------\ # | | diff --git a/alliance/src/documentation/alliance-examples/amd2901/Makefile b/alliance/src/documentation/alliance-examples/amd2901/Makefile index d3ff9662..824d6e5e 100644 --- a/alliance/src/documentation/alliance-examples/amd2901/Makefile +++ b/alliance/src/documentation/alliance-examples/amd2901/Makefile @@ -177,7 +177,7 @@ druc_ocp: amd2901_core_p.ap $(TOUCH) druc_ocp amd2901_core.ap: druc_ocp - $(NERO) -2 -p amd2901_core_p amd2901_core amd2901_core + $(NERO) -V -2 -p amd2901_core_p amd2901_core amd2901_core # amd2901_core.ap: druc_ocp # $(OCR) -v -l 2 -L amd2901_core -P amd2901_core_p -O amd2901_core diff --git a/alliance/src/documentation/alliance-examples/hadamard/Makefile b/alliance/src/documentation/alliance-examples/hadamard/Makefile index 9c068503..cd9310b4 100644 --- a/alliance/src/documentation/alliance-examples/hadamard/Makefile +++ b/alliance/src/documentation/alliance-examples/hadamard/Makefile @@ -24,7 +24,6 @@ BOOM = $(ALLIANCE_BIN)/boom BOOG = $(ALLIANCE_BIN)/boog LOON = $(ALLIANCE_BIN)/loon OCP = $(ALLIANCE_BIN)/ocp -OCR = $(ALLIANCE_BIN)/ocr NERO = $(ALLIANCE_BIN)/nero COUGAR = $(ALLIANCE_BIN)/cougar LVX = $(ALLIANCE_BIN)/lvx @@ -90,7 +89,7 @@ ENV_OCP = MBK_WORK_LIB=.; export MBK_WORK_LIB; \ MBK_OUT_PH=ap; export MBK_OUT_PH; \ MBK_CATAL_NAME=CATAL; export MBK_CATAL_NAME -ENV_OCR = MBK_WORK_LIB=.; export MBK_WORK_LIB; \ +ENV_NERO = MBK_WORK_LIB=.; export MBK_WORK_LIB; \ MBK_IN_LO=vst; export MBK_IN_LO; \ MBK_OUT_LO=vst; export MBK_OUT_LO; \ MBK_CATA_LIB=$(TARGET_LIB); export MBK_CATA_LIB; \ @@ -264,23 +263,14 @@ hadamard_model.vst : hadamard_model_o.vst hadamard_p.ap : res_synth_1.pat $(ENV_OCP); $(OCP) -v -ioc hadamard -margin 0.4 -gnuplot hadamard hadamard_p -# /*------------------------------------------------------------\ -# | | -# | OCR | -# | | -# \------------------------------------------------------------*/ - -hadamard.ap : hadamard_p.ap hadamard.vst - $(ENV_OCR); $(OCR) -v -l $(METAL_LEVEL) -L hadamard -P hadamard_p -O hadamard -# # /*------------------------------------------------------------\ # | | # | NERO | # | | # \------------------------------------------------------------*/ -hadamard_nero.ap : hadamard_p.ap hadamard.vst - $(ENV_OCR); $(NERO) -V -$(METAL_LEVEL) -p hadamard_p hadamard hadamard +hadamard.ap : hadamard_p.ap hadamard.vst + $(ENV_NERO); $(NERO) -V -$(METAL_LEVEL) -p hadamard_p hadamard hadamard # /*------------------------------------------------------------\ # | | diff --git a/alliance/src/documentation/alliance-examples/multi16b-reg/Makefile b/alliance/src/documentation/alliance-examples/multi16b-reg/Makefile index 5829c6b5..e8fa6874 100644 --- a/alliance/src/documentation/alliance-examples/multi16b-reg/Makefile +++ b/alliance/src/documentation/alliance-examples/multi16b-reg/Makefile @@ -24,7 +24,6 @@ BOOM = $(ALLIANCE_BIN)/boom BOOG = $(ALLIANCE_BIN)/boog LOON = $(ALLIANCE_BIN)/loon OCP = $(ALLIANCE_BIN)/ocp -OCR = $(ALLIANCE_BIN)/ocr NERO = $(ALLIANCE_BIN)/nero COUGAR = $(ALLIANCE_BIN)/cougar LVX = $(ALLIANCE_BIN)/lvx @@ -43,7 +42,7 @@ TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib RDS_TECHNO_SYMB = ../etc/techno-symb.rds RDS_TECHNO = ../etc/techno-035.rds SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg -METAL_LEVEL = 8 +METAL_LEVEL = 6 # /*------------------------------------------------------------\ # | | @@ -90,7 +89,7 @@ ENV_OCP = MBK_WORK_LIB=.; export MBK_WORK_LIB; \ MBK_OUT_PH=ap; export MBK_OUT_PH; \ MBK_CATAL_NAME=CATAL; export MBK_CATAL_NAME -ENV_OCR = MBK_WORK_LIB=.; export MBK_WORK_LIB; \ +ENV_NERO = MBK_WORK_LIB=.; export MBK_WORK_LIB; \ MBK_IN_LO=vst; export MBK_IN_LO; \ MBK_OUT_LO=vst; export MBK_OUT_LO; \ MBK_CATA_LIB=$(TARGET_LIB); export MBK_CATA_LIB; \ @@ -218,15 +217,12 @@ multi16_p.ap : res_synth_1.pat # /*------------------------------------------------------------\ # | | -# | OCR | +# | NERO | # | | # \------------------------------------------------------------*/ multi16.ap : multi16_p.ap multi16.vst - $(ENV_OCR); $(OCR) -i 1000 -v -l $(METAL_LEVEL) -L multi16 -P multi16_p -O multi16 - -multi16_nero.ap : multi16_p.ap multi16.vst - $(ENV_OCR); $(NERO) -v -$(METAL_LEVEL) -p multi16_p multi16 multi16 + $(ENV_NERO); $(NERO) -V -$(METAL_LEVEL) -p multi16_p multi16 multi16 # /*------------------------------------------------------------\ # | | diff --git a/alliance/src/documentation/alliance-examples/multi4b/Makefile b/alliance/src/documentation/alliance-examples/multi4b/Makefile index 2ea6d9c5..2f14ef4e 100644 --- a/alliance/src/documentation/alliance-examples/multi4b/Makefile +++ b/alliance/src/documentation/alliance-examples/multi4b/Makefile @@ -221,7 +221,7 @@ multi4_p.ap : res_synth_1.pat # \------------------------------------------------------------*/ multi4.ap : multi4_p.ap multi4.vst - $(ENV_NERO); $(NERO) -v -$(METAL_LEVEL) -p multi4_p multi4 multi4 + $(ENV_NERO); $(NERO) -V -$(METAL_LEVEL) -p multi4_p multi4 multi4 # /*------------------------------------------------------------\ # | | diff --git a/alliance/src/documentation/alliance-examples/multi8/Makefile b/alliance/src/documentation/alliance-examples/multi8/Makefile index c3caa3ac..da76e8dc 100644 --- a/alliance/src/documentation/alliance-examples/multi8/Makefile +++ b/alliance/src/documentation/alliance-examples/multi8/Makefile @@ -260,7 +260,7 @@ multi8_p.ap : res_synth_1.pat # \------------------------------------------------------------*/ multi8.ap : multi8_p.ap multi8.vst - $(ENV_NERO); $(NERO) -$(METAL_LEVEL) -p multi8_p multi8 multi8 + $(ENV_NERO); $(NERO) -V -$(METAL_LEVEL) -p multi8_p multi8 multi8 # /*------------------------------------------------------------\ # | | diff --git a/alliance/src/documentation/alliance-examples/multi8b/Makefile b/alliance/src/documentation/alliance-examples/multi8b/Makefile index b8095e51..59b3d3d4 100644 --- a/alliance/src/documentation/alliance-examples/multi8b/Makefile +++ b/alliance/src/documentation/alliance-examples/multi8b/Makefile @@ -42,7 +42,7 @@ TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib RDS_TECHNO_SYMB = ../etc/techno-symb.rds RDS_TECHNO = ../etc/techno-035.rds SPI_MODEL = $(ALLIANCE_TOP)/etc/spimodel.cfg -METAL_LEVEL = 2 +METAL_LEVEL = 4 # /*------------------------------------------------------------\ # | | @@ -221,7 +221,7 @@ multi8_p.ap : res_synth_1.pat # \------------------------------------------------------------*/ multi8.ap : multi8_p.ap multi8.vst - $(ENV_NERO); $(NERO) -v -$(METAL_LEVEL) -p multi8_p multi8 multi8 + $(ENV_NERO); $(NERO) -V -$(METAL_LEVEL) -p multi8_p multi8 multi8 # /*------------------------------------------------------------\ # | | diff --git a/alliance/src/documentation/alliance-examples/pgcd/Makefile b/alliance/src/documentation/alliance-examples/pgcd/Makefile index 8a27c2ee..5a937bb4 100644 --- a/alliance/src/documentation/alliance-examples/pgcd/Makefile +++ b/alliance/src/documentation/alliance-examples/pgcd/Makefile @@ -242,7 +242,7 @@ pgcd_p.ap : res_synth_1.pat # \------------------------------------------------------------*/ pgcd.ap : pgcd_p.ap pgcd.vst - $(ENV_NERO); $(NERO) -v -$(METAL_LEVEL) -p pgcd_p pgcd pgcd + $(ENV_NERO); $(NERO) -V -$(METAL_LEVEL) -p pgcd_p pgcd pgcd # /*------------------------------------------------------------\ # | |