Updated ciffar10 example for GNU

* Updated README.md fixed links

* fixed typo in makefile and README.md

* fixed typo in example_har_smartphone/Makefile, fixed default target to .DEFAULT_GOAL

* fixed lib/make/makefile added ignored error of clean rules

Author: dyudakov

README.md

@@ -34,12 +34,12 @@ examples and documentation.
 
 ## Building and quick start
 ---------------------------
-By default embARC MLI Library can be build for (hw/em9d.tcf) which is based on the standard EM9D Voice Audio template, 
+By default embARC MLI Library can be build for [/hw/em9d.tcf](/hw/em9d.tcf) which is based on the standard EM9D Voice Audio template, 
 defined in MetaWare Development Tools, with extended XY memory. embARC MLI Library can be also built for a specific 
 EM or HS configuration.
 
 Build requirements:
-1. MetaWare Development tools 2018.09 or later
+1. MetaWare Development tools 2018.12 or later
 
 Building of embARC MLI library	
 1. Open command line and change working directory to './lib/make/'      
@@ -56,7 +56,7 @@ Building of embARC MLI library
 3. Run CIFAR10 example
 	'gmake run TCF_FILE=../../hw/em9d.tcf'
 
-4. Result Quality shall be "S/N=2344.4     (67.4 db)"
+4. Result Quality shall be "S/N=3638.6     (71.2 db)"
 
 ## Building and running [Human Activity Recognition example](examples/example_har_smartphone/README.md)
 ----------------------------------------------------------

examples/example_cifar10_caffe/Makefile

@@ -27,32 +27,71 @@
 
 # default toolchain
 TOOLCHAIN ?= mwdt
-TCF_FILE ?= ../../hw/em9d.tcf
+
+# default hardware config file
+TCF_FILE  ?= ../../hw/em9d.tcf
 
 # Directories and files
-PUBLIC_DIR ?= ../..
-SRC_DIRS 	= $(PUBLIC_DIR)/examples/example_cifar10_caffe \
-			  $(PUBLIC_DIR)/examples/auxiliary
+EMBARC_MLI_DIR ?= ../..
+SRC_DIRS     = $(EMBARC_MLI_DIR)/examples/example_cifar10_caffe \
+               $(EMBARC_MLI_DIR)/examples/auxiliary
 
-INC_DIRS 	= . \
-			  $(PUBLIC_DIR)/include\
-			  $(PUBLIC_DIR)/examples/auxiliary
+INC_DIRS     = . \
+               $(EMBARC_MLI_DIR)/include \
+               $(EMBARC_MLI_DIR)/examples/auxiliary
 
-EXT_LIBS	?= $(PUBLIC_DIR)/bin/libmli.a
-OUT_DIR		?= ./bin
-BUILD_DIR	?= ./obj
-OUT_NAME	?= example_cifar10_caffe
-CFLAGS		= -Hnocopyr -Hpurge -Hheap=16K -Hstack=4K -Hfxapi -e_start -Bgrouplib -Hldopt=-q -O0
+EXT_LIBS_DIR ?= $(EMBARC_MLI_DIR)/bin
+EXT_LIBS     ?= $(EXT_LIBS_DIR)/libmli.a
+OUT_DIR      ?= ./bin
+BUILD_DIR    ?= ./obj
+OUT_NAME     ?= example_cifar10_caffe
+ifeq ($(TOOLCHAIN),mwdt)
+# MWDT specific options
+CFLAGS       =  -Hnocopyr -Hpurge -Hheap=8K -Hstack=4K -Hfxapi -e_start -Bgrouplib -Hldopt=-q -O0
+else
+PREBUILT_LIB ?= $(EMBARC_MLI_DIR)/examples/prebuilt/libmli.a
 
-all: lib app 
+# GNU toolchain specific options - correct it according to your target platform settings (see build_configuration.txt for input)
+#Iot DevKit config
+CFLAGS       =  -mcpu=em4_dmips -mlittle-endian -mcode-density -mdiv-rem -mswap -mnorm -mmpy-option=6 -mbarrel-shifter -mxy
+
+# The embARC MLI Library specific options it according to your target platform settings 
+#(EM5D or EM7D platform)
+#CFLAGS      += -DV2DSP
+#(EM9D or EM11D platform)
+CFLAGS      += -DV2DSP_XY
+#(HS45D or HS47D platform)
+#CFLAGS      += -DV2DSP_WIDE
 
-include $(PUBLIC_DIR)/build/rules.mk
+# GNU toolchain linker specific options
+LDFLAGS      = --defsym=__DEFAULT_HEAP_SIZE=8k 
+LDFLAGS     += --defsym=__DEFAULT_STACK_SIZE=4k
+LDFLAGS     += -Map $(OUT_DIR)/$(OUT_NAME).map
+
+#specific options for run the example with the MetaWare Debuger on the nSim simulator. 
+DBG_OPTS     = -cmd="read mdb_com_gnu"
+endif
 
 .PHONY: clean all lib cleanall app
-.DEFAULT: all
+.DEFAULT_GOAL := all
+
+all: lib app 
+
+$(EXT_LIBS): $(EXT_LIBS_DIR)
+	@echo Copy prebuilt library $(PREBUILT_LIB) to $@
+	@$(CP) $(call fix_platform_path,$(PREBUILT_LIB)) $(call fix_platform_path,$@)
+
+$(EXT_LIBS_DIR):
+	$(MKDIR) $(call fix_platform_path, $@ )
+
+include $(EMBARC_MLI_DIR)/build/rules.mk
 
+ifeq ($(TOOLCHAIN),mwdt)
 lib:
 	@ $(MAKE) generic_lib -C ..$(PS)..$(PS)lib$(PS)make$(PS) TCF_FILE="$(TCF_FILE)"
+else
+lib: $(EXT_LIBS)
+endif
 
 app: generic_app
 

examples/example_cifar10_caffe/README.md

@@ -5,9 +5,18 @@ Example is based on standard [Caffe tutorial](http://caffe.berkeleyvision.org/ga
 
 Quick Start
 --------------
-hw/em9d.tcf template is a default template for this example. Other templated can be also used. 
 
-0. embARC MLI Library must be built for required hardware configuration first. See [embARC MLI Library building and quick start](public/README.md).
+Example supports building using MetaWare Development tools and ARC GNU toolchain and running with MetaWare Debuger on nSim simulator.
+
+### Build with MetaWare Development tools
+
+    Build requirements:
+        - MetaWare Development tools version 2018.12 or higher
+        - gmake
+
+Here we will consider building for [/hw/em9d.tcf](/hw/em9d.tcf) template. This template is a default template for this example. Other templated can be also used. 
+
+0. embARC MLI Library must be built for required hardware configuration first. See [embARC MLI Library building and quick start](/README.md#building-and-quick-start).
 
 1. Open command line and change working directory to './examples/example_cifar10_caffe/'
 
@@ -19,11 +28,54 @@ hw/em9d.tcf template is a default template for this example. Other templated can
 
        gmake TCF_FILE=../../hw/em9d.tcf 
 
-4. Run example 
+### Run example with MetaWare Debuger on nSim simulator.
 
        gmake run TCF_FILE=../../hw/em9d.tcf
 
-5. Result Quality shall be "S/N=2344.4     (67.4 db)"
+    Result Quality shall be "S/N=3638.6     (71.2 db)"
+
+### Build with ARC GNU toolchain
+
+Here we will consider building with ARC GNU toolchain. As a platform for the assembly, we use the [IoT Devkit](https://embarc.org/embarc_osp/doc/build/html/board/iotdk.html) from [the embARC Open Software Platform (OSP)](https://embarc.org/embarc_osp/doc/build/html/introduction/introduction.html#)
+
+    Build requirements:
+        - ARC GNU toolchain version 2018.09 or higher
+        - embARC MLI Library prebuilt with MetaWare Development tools for IoT Devkit hardware configuration
+        - gmake
+
+0. Prebuilt embARC MLI Library  must be copyied into the ./examples/prebuilt folder.
+
+1. Open command line and change working directory to './examples/example_cifar10_caffe/'
+
+2. Clean previous build artifacts (optional)
+
+        gmake TOOLCHAIN=gnu clean
+
+3. Build example
+
+        gmake TOOLCHAIN=gnu
+
+   Notes: IoT Devkit hardware configuration is specifed in Makefile. Additionally used memory.x linkscript file for GNU linker. 
+
+### Run example with MetaWare Debuger on nSim simulator.
+
+    Run requirements:
+    - MetaWare Development tools version 2018.12 or higher
+    - arcem9d.tcf file with hardware configuration of IoT Devkit for setup nSim.
+
+0. Copy the [arcem9d.tcf](https://github.com/foss-for-synopsys-dwc-arc-processors/embarc_osp/blob/master/board/iotdk/configs/10/tcf/arcem9d.tcf) file into example folder.
+
+1. Run example 
+
+        gmake run TOOLCHAIN=gnu TCF_FILE=arcem9d.tcf
+
+    Result Quality shall be "S/N=3638.6     (71.2 db)"
+
+    Notes: Example built by ARC GNU tools is run using mdb_com_gnu script file. Modify this file to customize the example run mode. See [More Options on Building and Running](README.md#more-options-on-building-and-running)
+
+### Run example without MetaWare Development tools
+
+See documentation on [IoT Devkit](https://embarc.org/embarc_osp/doc/build/html/board/iotdk.html) on how to run executable built with [ARC GNU](https://embarc.org/toolchain/index.html) and [ARC open source development tools](https://embarc.org/embarc_osp/doc/build/html/index.html) on IoT Devkit.
 
 
 Example Structure
@@ -43,11 +95,16 @@ Structure of example application may be logically divided on three parts:
    * ../auxiliary/tests_aux.h(.c)
    * ../auxiliary/idx_file.h(.c)
 
-Example structure also contains test set including small subset of CIFAR-10 (20 vectors organized in IDX file format).
-   
+Example structure contains test set including small subset of CIFAR-10 (20 vectors organized in IDX file format).
+
+Example structure also contains auxiliary files for development tools:
+ * arcem9d.lcf - linkscript file for MetaWare linker.
+ * memory.x    - linkscript file for GNU linker.
+ * mdb_com_gnu - command script file for MetaWare Debugger.
+
 More Options on Building and Running
 ---------------------------------------
-CIFAR-10 example application is implemented in the same way as LSTM Based HAR example and provides the same configuration and running abilities. For more details see appropriate HAR example [description part](public/examples/example_har_smartphone/README.md).
+CIFAR-10 example application is implemented in the same way as LSTM Based HAR example and provides the same configuration and running abilities. For more details see appropriate HAR example [description part](/examples/example_har_smartphone/README.md#more-options-on-building-and-running).
 
 References
 ----------------------------

examples/example_cifar10_caffe/arcem9d.lcf

@@ -0,0 +1,41 @@
+MEMORY {
+#   SYSTEM0 : ORIGIN = 0x00000000, LENGTH = 0x20000000
+    ICCM0   : ORIGIN = 0x20000000, LENGTH = 0x00040000
+#   CCMWRAP0: ORIGIN = 0x20040000, LENGTH = 0x0ffc0000
+#   SYSTEM1 : ORIGIN = 0x30000000, LENGTH = 0x50000000
+    DCCM    : ORIGIN = 0x80000000, LENGTH = 0x00020000
+#   CCMWRAP1: ORIGIN = 0x80020000, LENGTH = 0x0ffe0000
+#   SYSTEM2 : ORIGIN = 0x90000000, LENGTH = 0x30000000
+    XCCM    : ORIGIN = 0xc0000000, LENGTH = 0x00008000
+#   CCMWRAP2: ORIGIN = 0xc0008000, LENGTH = 0x0fff8000
+#   SYSTEM3 : ORIGIN = 0xd0000000, LENGTH = 0x10000000
+    YCCM    : ORIGIN = 0xe0000000, LENGTH = 0x00008000
+#   CCMWRAP3: ORIGIN = 0xe0008000, LENGTH = 0x0fff8000
+#   SYSTEM4 : ORIGIN = 0xf0000000, LENGTH = 0x10000000
+    }
+SECTIONS {
+    GROUP: {
+    .vectors (TEXT) SIZE(DEFINED _IVTSIZE?_IVTSIZE:684): {} = FILL(0xa5a5a5a5,4)
+    .text? : { *('.text$crt*') }
+        * (TEXT): {}
+        * (LIT): {}
+    } > ICCM0
+    GROUP: {
+    /* _SDA_BASE_ computed implicitly */
+        .sdata?: {}
+        .sbss?: {}
+        * (DATA): {}
+        * (BSS): {}
+        .mli_model_p2 : {}
+       .stack ALIGN(4) SIZE(DEFINED _STACKSIZE?_STACKSIZE:32768): {}
+       .heap? ALIGN(4) SIZE(DEFINED _HEAPSIZE?_HEAPSIZE:0): {}
+    } > DCCM
+    GROUP: {
+        .Xdata? : {}
+        .mli_model : {}
+        } > XCCM
+    GROUP: {
+        .Ydata? : {}
+        } > YCCM
+    
+    }

examples/example_cifar10_caffe/cifar10_constants.h

@@ -47,7 +47,31 @@ typedef int16_t w_type;
 // Defining data sections attributes
 //===================================
 #if (ARC_PLATFORM == V2DSP_XY)
-// Model Weights attribute 
+#if defined (__GNUC__) && !defined (__CCAC__)
+// ARC GNU tools
+// Model Weights attribute
+#define _Wdata_attr __attribute__((section(".mli_model")))
+#define _W  _Wdata_attr
+
+// Model Weights (part 2) attribute 
+#define _W2data_attr __attribute__((section(".mli_model_p2")))
+#define _W2  _W2data_attr
+
+// Bank X (XCCM) attribute
+#define __Xdata_attr __attribute__((section(".Xdata")))
+#define _X  __Xdata_attr
+
+// Bank Y (YCCM) attribute
+#define __Ydata_attr __attribute__((section(".Ydata")))
+#define _Y  __Ydata_attr
+
+// Bank Z (DCCM) attribute
+#define __Zdata_attr __attribute__((section(".Zdata")))
+#define _Z  __Zdata_attr
+
+#else	
+// Metaware tools
+// Model Weights attribute
 #define _Wdata_attr __attribute__((section(".mli_model")))
 #define _W __xy _Wdata_attr
 
@@ -66,6 +90,7 @@ typedef int16_t w_type;
 // Bank Z (DCCM) attribute
 #define __Zdata_attr __attribute__((section(".Zdata")))
 #define _Z __xy __Zdata_attr
+#endif // if defined (__GNUC__) && !defined (__CCAC__)
 
 #else
 #define _X __attribute__((section(".mli_ir_buf")))

examples/example_cifar10_caffe/mdb_com_gnu

@@ -0,0 +1,28 @@
+//This script emulates the arvc and argv parameters in examples for GNU tools
+
+off=cr_for_more
+
+break main
+
+run
+//Select one mode to uncomment lines with the fillmem command
+
+//----------mode 1-----------------------------------
+//--Built-in input processing------------------------
+fillmem 0x1 &mode 1
+fillmem "dummy_for_check" &param[0][0] 15
+
+//----------mode 2-----------------------------------
+//--External test-set processing---------------------
+//fillmem 0x2 &mode 1
+//fillmem "dummy_for_check" &param[0][0] 15
+//fillmem "small_test_base/tests.idx" &param[1][0] 25
+
+//-----------mode 3----------------------------------
+//--Accuracy measurement for testset-----------------
+//fillmem 0x3 &mode 1
+//fillmem "dummy_for_check" &param[0][0] 15
+//fillmem "small_test_base/tests.idx" &param[1][0] 25
+//fillmem "small_test_base/labels.idx" &param[2][0] 26
+
+run