sw/vec: Merge ITCM and DTCM into TCM.
Change-Id: Id5f024248f4affa4a393b9460d4a15daf6a2f331
diff --git a/faults/CMakeLists.txt b/faults/CMakeLists.txt
index 37301f2..6a876f9 100644
--- a/faults/CMakeLists.txt
+++ b/faults/CMakeLists.txt
@@ -7,8 +7,6 @@
illegal_instruction
SRCS
illegal_instruction.c
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_binary(
@@ -16,8 +14,6 @@
write_past_data_window
SRCS
write_past_data_window.c
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_binary(
@@ -25,6 +21,4 @@
execute_past_inst_window
SRCS
execute_past_inst_window.c
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
diff --git a/faults/execute_past_inst_window.c b/faults/execute_past_inst_window.c
index beadb60..bb910a6 100644
--- a/faults/execute_past_inst_window.c
+++ b/faults/execute_past_inst_window.c
@@ -1,8 +1,11 @@
#include "layout.h"
+// TODO(jesionowski): This program won't work until we break up TCM into
+// multiple sections.
+
int main() {
// The end of the virtual window will be outside our allocated window.
- int* i = (int*)(IMMU_RANGE_START + IMMU_WINDOW_SIZE - sizeof(int));
+ int* i = (int*)(MMU_RANGE_START + MMU_WINDOW_SIZE - sizeof(int));
((void (*)())i)();
return 0;
}
diff --git a/faults/layout.h b/faults/layout.h
index d8c6a80..0e304ca 100644
--- a/faults/layout.h
+++ b/faults/layout.h
@@ -1,11 +1,8 @@
#ifndef LAYOUT_H_
#define LAYOUT_H_
-#define IMMU_NUM_WINDOWS 2
-#define IMMU_WINDOW_SIZE 0x100000
-#define IMMU_RANGE_START 0x32000000
-#define DMMU_NUM_WINDOWS 4
-#define DMMU_WINDOW_SIZE 0x400000
-#define DMMU_RANGE_START 0x34000000
+#define MMU_NUM_WINDOWS 6
+#define MMU_WINDOW_SIZE 0x1000000
+#define MMU_RANGE_START 0x34000000
#endif
diff --git a/faults/write_past_data_window.c b/faults/write_past_data_window.c
index b143126..cc69c18 100644
--- a/faults/write_past_data_window.c
+++ b/faults/write_past_data_window.c
@@ -1,10 +1,10 @@
#include "layout.h"
-// TODO(jesionowski): This program won't work until we change the way the DMEM
+// TODO(jesionowski): This program won't work until we change the way the heap
// is allocated: currently the remaning memory after data is consumed by .heap.
int main() {
- int* i = (int*)(DMMU_RANGE_START + 0x4000 - sizeof(int));
+ int* i = (int*)(MMU_RANGE_START + 0x4000 - sizeof(int));
*i = 0;
return 0;
}
diff --git a/pw_unit_test_demo/CMakeLists.txt b/pw_unit_test_demo/CMakeLists.txt
index 96a718e..31a013d 100644
--- a/pw_unit_test_demo/CMakeLists.txt
+++ b/pw_unit_test_demo/CMakeLists.txt
@@ -6,6 +6,4 @@
pw_unit_test_demo
SRCS
pw_unit_test_demo.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
diff --git a/scripts/test_runner.py b/scripts/test_runner.py
index 4b905f2..383b384 100755
--- a/scripts/test_runner.py
+++ b/scripts/test_runner.py
@@ -150,8 +150,8 @@
"trace_file": trace_file
}
self.spike_simulator_cmd = (
- "%(path)s -m0x32000000:0x100000,0x34000000:0x1000000 "
- "--pc=0x32000000 ")
+ "%(path)s -m0x34000000:0x1000000 "
+ "--pc=0x34000000 ")
if args.trace_output:
self.spike_simulator_cmd += " -l --log=%(trace_file)s "
diff --git a/softrvv/tests/CMakeLists.txt b/softrvv/tests/CMakeLists.txt
index 364304d..cc3979e 100644
--- a/softrvv/tests/CMakeLists.txt
+++ b/softrvv/tests/CMakeLists.txt
@@ -5,8 +5,6 @@
softrvv_vwadd_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -16,8 +14,6 @@
softrvv_vwaddu_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -27,8 +23,6 @@
softrvv_vwsub_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -38,8 +32,6 @@
softrvv_vwsubu_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -49,8 +41,6 @@
softrvv_vor_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -60,8 +50,6 @@
softrvv_vsext_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -71,8 +59,6 @@
softrvv_vzext_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -82,8 +68,6 @@
softrvv_vmin_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -91,8 +75,6 @@
vadd
TEMPLATE
softrvv_vadd_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -100,8 +82,6 @@
vsub
TEMPLATE
softrvv_vsub_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -109,8 +89,6 @@
vmul
TEMPLATE
softrvv_vmul_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -118,8 +96,6 @@
vmulh
TEMPLATE
softrvv_vmulh_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -127,8 +103,6 @@
vdiv
TEMPLATE
softrvv_vdiv_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -136,8 +110,6 @@
vrem
TEMPLATE
softrvv_vrem_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -145,8 +117,6 @@
vxor
TEMPLATE
softrvv_vxor_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -154,8 +124,6 @@
vsll
TEMPLATE
softrvv_vsll_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -163,8 +131,6 @@
vsrl
TEMPLATE
softrvv_vsrl_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -172,8 +138,6 @@
vsra
TEMPLATE
softrvv_vsra_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -181,8 +145,6 @@
vnsrl
TEMPLATE
softrvv_vnsrl_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -190,8 +152,6 @@
vnsra
TEMPLATE
softrvv_vnsra_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -199,8 +159,6 @@
vmseq
TEMPLATE
softrvv_vmseq_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -208,8 +166,6 @@
vmsne
TEMPLATE
softrvv_vmsne_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -217,8 +173,6 @@
vmslt
TEMPLATE
softrvv_vmslt_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -226,8 +180,6 @@
vmsle
TEMPLATE
softrvv_vmsle_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -235,8 +187,6 @@
vmsgt
TEMPLATE
softrvv_vmsgt_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -244,8 +194,6 @@
vmsge
TEMPLATE
softrvv_vmsge_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -253,8 +201,6 @@
vredsum
TEMPLATE
softrvv_vredsum_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -264,8 +210,6 @@
softrvv_vmax_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -275,8 +219,6 @@
softrvv_vmaxu_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -286,8 +228,6 @@
softrvv_vand_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -297,8 +237,6 @@
softrvv_vmv_s_x_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -308,8 +246,6 @@
softrvv_vmacc_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -319,8 +255,6 @@
softrvv_vmadd_vnmsub_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
if(${BUILD_SIMPLIFIED_CORE})
@@ -334,8 +268,6 @@
vec_disable_test.cpp
DEPS
softrvv
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=256K
)
softrvv_vec_cc_generated_test(
@@ -343,8 +275,6 @@
vfadd
TEMPLATE
softrvv_vfadd_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
softrvv_vec_cc_generated_test(
@@ -352,6 +282,4 @@
vfsub
TEMPLATE
softrvv_vfsub_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
diff --git a/springbok/springbok.ld b/springbok/springbok.ld
index 9782844..8b68fd1 100644
--- a/springbok/springbok.ld
+++ b/springbok/springbok.ld
@@ -14,20 +14,17 @@
* limitations under the License.
*/
-ITCM_LENGTH = DEFINED(__itcm_length__) ? __itcm_length__ : 64K;
-DTCM_LENGTH = DEFINED(__dtcm_length__) ? __dtcm_length__ : 4M;
-
+TCM_LENGTH = DEFINED(__tcm_length__) ? __tcm_length__ : 4M;
MEMORY
{
- ITCM (rx) : ORIGIN = 0x32000000, LENGTH = ITCM_LENGTH
- DTCM (rw) : ORIGIN = 0x34000000, LENGTH = DTCM_LENGTH
+ TCM (rw) : ORIGIN = 0x34000000, LENGTH = TCM_LENGTH
}
STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
-PROVIDE( _stack_ptr = ORIGIN(DTCM) + LENGTH(DTCM) - 64 );
-PROVIDE( _stack_start_sentinel = ORIGIN(DTCM) + LENGTH(DTCM) - STACK_SIZE );
-PROVIDE( _stack_end_sentinel = ORIGIN(DTCM) + LENGTH(DTCM) - 64 );
+PROVIDE( _stack_ptr = ORIGIN(TCM) + LENGTH(TCM) - 64 );
+PROVIDE( _stack_start_sentinel = ORIGIN(TCM) + LENGTH(TCM) - STACK_SIZE );
+PROVIDE( _stack_end_sentinel = ORIGIN(TCM) + LENGTH(TCM) - 64 );
ENTRY(_start)
@@ -39,7 +36,7 @@
KEEP(*(.text._start))
*(.text*)
_etext = .;
- } > ITCM
+ } > TCM
.rodata :
{
@@ -47,14 +44,14 @@
_srodata = .;
*(.rodata*)
_erodata = .;
- } > DTCM
+ } > TCM
.preinit_array :
{
PROVIDE(__preinit_array_start = .);
KEEP(*(.preinit_array))
PROVIDE(__preinit_array_end = .);
- } > DTCM
+ } > TCM
.init_array :
{
@@ -62,7 +59,7 @@
KEEP(*(SORT(.init_array.*)))
KEEP(*(.init_array))
PROVIDE(__init_array_end = .);
- } > DTCM
+ } > TCM
.fini_array :
{
@@ -70,7 +67,7 @@
KEEP(*(SORT(.fini_array.*)))
KEEP(*(.fini_array))
PROVIDE(__fini_array_end = .);
- } > DTCM
+ } > TCM
.data :
{
@@ -79,7 +76,7 @@
_sdata = .;
*(.data*)
_edata = .;
- } > DTCM
+ } > TCM
.bss (NOLOAD) :
{
@@ -88,24 +85,24 @@
*(.bss*)
*(COMMON)
_ebss = .;
- } > DTCM
+ } > TCM
.heap (NOLOAD) :
{
. = ALIGN(64);
_sheap = .;
- . = ORIGIN(DTCM) + LENGTH(DTCM) - STACK_SIZE - 63;
+ . = ORIGIN(TCM) + LENGTH(TCM) - STACK_SIZE - 63;
. = ALIGN(64);
_eheap = .;
- } > DTCM
+ } > TCM
- .stack ORIGIN(DTCM) + LENGTH(DTCM) - STACK_SIZE (NOLOAD) :
+ .stack ORIGIN(TCM) + LENGTH(TCM) - STACK_SIZE (NOLOAD) :
{
_sstack = .;
. = . + STACK_SIZE;
. = ALIGN(64);
_estack = .;
- } > DTCM
+ } > TCM
_end = .;
}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ba12983..5205697 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,8 +7,6 @@
vfadd
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -16,8 +14,6 @@
vfsub
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -25,8 +21,6 @@
vfrsub
TEMPLATE
opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -34,8 +28,6 @@
vfdiv
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -43,8 +35,6 @@
vfrdiv
TEMPLATE
opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -52,8 +42,6 @@
vfmax
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -61,8 +49,6 @@
vfmin
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -70,8 +56,6 @@
vfmul
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -79,8 +63,6 @@
vmfeq
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -88,8 +70,6 @@
vmfge
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -97,8 +77,6 @@
vmfgt
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -106,8 +84,6 @@
vmfle
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -115,8 +91,6 @@
vmflt
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -124,8 +98,6 @@
vmfne
TEMPLATE
opivv_opivf_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -133,8 +105,6 @@
vsub
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -142,8 +112,6 @@
vrsub
TEMPLATE
opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=256K
)
vec_cc_generated_test(
@@ -151,8 +119,6 @@
vadd
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=256K
)
vec_cc_generated_test(
@@ -160,8 +126,6 @@
vor
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=256K
)
vec_cc_generated_test(
@@ -169,8 +133,6 @@
vxor
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=256K
)
vec_cc_generated_test(
@@ -178,8 +140,6 @@
vmin
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -187,8 +147,6 @@
vminu
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -196,8 +154,6 @@
vmul
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -205,8 +161,6 @@
vmulh
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -214,8 +168,6 @@
vmulhu
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -223,8 +175,6 @@
vdiv
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -232,8 +182,6 @@
vdivu
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -241,8 +189,6 @@
vrem
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -250,8 +196,6 @@
vremu
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -259,8 +203,6 @@
vwadd
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -268,8 +210,6 @@
vwaddu
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -277,8 +217,6 @@
vwsub
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -286,8 +224,6 @@
vwsubu
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -295,8 +231,6 @@
vmax
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
@@ -305,8 +239,6 @@
vand
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=200K
)
vec_cc_generated_test(
@@ -314,8 +246,6 @@
vmaxu
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -323,8 +253,6 @@
vsext
TEMPLATE
vxunary0_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -332,8 +260,6 @@
vzext
TEMPLATE
vxunary0_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_generated_test(
@@ -341,8 +267,6 @@
vsll
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -350,8 +274,6 @@
vsrl
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -359,8 +281,6 @@
vsra
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -368,8 +288,6 @@
vnsrl
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -377,8 +295,6 @@
vnsra
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -386,8 +302,6 @@
vmseq
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -395,8 +309,6 @@
vmsne
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -404,8 +316,6 @@
vmsltu
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -413,8 +323,6 @@
vmslt
TEMPLATE
opivv_opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -422,8 +330,6 @@
vmsleu
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -431,8 +337,6 @@
vmsle
TEMPLATE
opivv_opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -440,8 +344,6 @@
vmsgtu
TEMPLATE
opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -449,8 +351,6 @@
vmsgt
TEMPLATE
opivx_opivi_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -458,8 +358,6 @@
vmsgeu
TEMPLATE
opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_generated_test(
@@ -467,8 +365,6 @@
vmsge
TEMPLATE
opivx_test.tpl.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=192K
)
vec_cc_test(
@@ -476,8 +372,6 @@
vsetvl_test
SRCS
vsetvl_test.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -485,8 +379,6 @@
vle_vse_test
SRCS
vle_vse_test.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
TIMEOUT
40
)
@@ -496,8 +388,6 @@
vmv_test
SRCS
vmv_test.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
TIMEOUT
40
)
@@ -507,8 +397,6 @@
vmv_s_x_test
SRCS
vmv_s_x_test.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
TIMEOUT
40
)
@@ -518,8 +406,6 @@
vlnr_vsnr_test
SRCS
vlnr_vsnr_test.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
vec_cc_test(
@@ -527,6 +413,4 @@
vmerge_test
SRCS
vmerge_test.cpp
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
diff --git a/vector_executive/CMakeLists.txt b/vector_executive/CMakeLists.txt
index 8128db2..f46bd94 100644
--- a/vector_executive/CMakeLists.txt
+++ b/vector_executive/CMakeLists.txt
@@ -7,6 +7,4 @@
vector_executive
SRCS
vector_executive.c
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
diff --git a/vector_load_store_tests/CMakeLists.txt b/vector_load_store_tests/CMakeLists.txt
index fc5a350..c51d8bc 100644
--- a/vector_load_store_tests/CMakeLists.txt
+++ b/vector_load_store_tests/CMakeLists.txt
@@ -9,6 +9,4 @@
vector_load_store_tests.c
DEPS
vector_tests
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
diff --git a/vector_vadd_vsub_tests/CMakeLists.txt b/vector_vadd_vsub_tests/CMakeLists.txt
index 72e39b2..aa3971d 100644
--- a/vector_vadd_vsub_tests/CMakeLists.txt
+++ b/vector_vadd_vsub_tests/CMakeLists.txt
@@ -15,7 +15,5 @@
COPTS
-Wno-unused-value
-D=TEST_${OPERAND_TYPE}
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
endforeach()
diff --git a/vector_vset_tests/CMakeLists.txt b/vector_vset_tests/CMakeLists.txt
index 6557b2f..d5e9b1c 100644
--- a/vector_vset_tests/CMakeLists.txt
+++ b/vector_vset_tests/CMakeLists.txt
@@ -9,6 +9,4 @@
vector_vset_tests.c
DEPS
vector_tests
- LINKOPTS
- -Xlinker --defsym=__itcm_length__=128K
)
