diff mbox series

[v2,07/16] tests/tcg/xtensa: enable system tests

Message ID 20190228202537.4638-8-alex.bennee@linaro.org
State Superseded
Headers show
Series Enabling tcg/tests for cris and system mode xtensa & arm | expand

Commit Message

Alex Bennée Feb. 28, 2019, 8:25 p.m. UTC 
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


---
v2
  - use cross CC for linker
  - fix up test selection to skip linker.ld.S
---
 tests/tcg/xtensa/Makefile                | 93 ------------------------
 tests/tcg/xtensa/Makefile.softmmu-target | 40 ++++++++++
 2 files changed, 40 insertions(+), 93 deletions(-)
 delete mode 100644 tests/tcg/xtensa/Makefile
 create mode 100644 tests/tcg/xtensa/Makefile.softmmu-target

-- 
2.20.1

Comments

Philippe Mathieu-Daudé Feb. 28, 2019, 10:54 p.m. UTC | #1 
On 2/28/19 9:25 PM, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> 

> ---

> v2

>   - use cross CC for linker

>   - fix up test selection to skip linker.ld.S

> ---

>  tests/tcg/xtensa/Makefile                | 93 ------------------------

>  tests/tcg/xtensa/Makefile.softmmu-target | 40 ++++++++++

>  2 files changed, 40 insertions(+), 93 deletions(-)

>  delete mode 100644 tests/tcg/xtensa/Makefile

>  create mode 100644 tests/tcg/xtensa/Makefile.softmmu-target

> 

> diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile

> deleted file mode 100644

> index 2f5691f75b..0000000000

> --- a/tests/tcg/xtensa/Makefile

> +++ /dev/null

> @@ -1,93 +0,0 @@

> --include ../../../config-host.mak

> -

> -CORE=dc232b

> -CROSS=xtensa-$(CORE)-elf-

> -

> -ifndef XT

> -SIM = ../../../xtensa-softmmu/qemu-system-xtensa

> -SIMFLAGS = -M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel

> -SIMDEBUG = -s -S

> -else

> -SIM = xt-run

> -SIMFLAGS = --xtensa-core=DC_B_232L --exit_with_target_code $(EXTFLAGS)

> -SIMDEBUG = --gdbserve=0


Max: I think it should be quite easy to port your simulator to Alex's
new Makefile.
One possibility is adding tests/tcg/xtensa/Makefile.xt-run which set few
variables, include Makefile.softmmu-target and overwrite variables if
necessary.

BTW is this simulator downloadable? I see the Zephyr project also uses
it, and I looked for it on https://ip.cadence.com/swdev but couldnt find
a (public) link.

> -endif

> -

> -HOST_CC = gcc

> -CC      = $(CROSS)gcc

> -AS      = $(CROSS)gcc -x assembler-with-cpp

> -LD      = $(CROSS)ld

> -

> -XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa

> -INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target/xtensa/core-$(CORE)

> -XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS))

> -

> -LDFLAGS = -Tlinker.ld

> -

> -CRT        = crt.o vectors.o

> -

> -TESTCASES += test_b.tst

> -TESTCASES += test_bi.tst

> -#TESTCASES += test_boolean.tst

> -TESTCASES += test_break.tst

> -TESTCASES += test_bz.tst

> -TESTCASES += test_cache.tst

> -TESTCASES += test_clamps.tst

> -TESTCASES += test_extui.tst

> -TESTCASES += test_fail.tst

> -TESTCASES += test_interrupt.tst

> -TESTCASES += test_loop.tst

> -TESTCASES += test_mac16.tst

> -TESTCASES += test_max.tst

> -TESTCASES += test_min.tst

> -TESTCASES += test_mmu.tst

> -TESTCASES += test_mul16.tst

> -TESTCASES += test_mul32.tst

> -TESTCASES += test_nsa.tst

> -TESTCASES += test_phys_mem.tst

> -ifdef XT

> -TESTCASES += test_pipeline.tst

> -endif

> -TESTCASES += test_quo.tst

> -TESTCASES += test_rem.tst

> -TESTCASES += test_rst0.tst

> -TESTCASES += test_s32c1i.tst

> -TESTCASES += test_sar.tst

> -TESTCASES += test_sext.tst

> -TESTCASES += test_shift.tst

> -TESTCASES += test_sr.tst

> -TESTCASES += test_timer.tst

> -TESTCASES += test_windowed.tst

> -

> -all: build

> -

> -linker.ld: $(XTENSA_SRC_PATH)/linker.ld.S

> -	$(HOST_CC) $(XTENSA_INC) -E -P $< -o $@

> -

> -%.o: $(XTENSA_SRC_PATH)/%.c

> -	$(CC) $(XTENSA_INC) $(CFLAGS) -c $< -o $@

> -

> -%.o: $(XTENSA_SRC_PATH)/%.S

> -	$(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@

> -

> -%.tst: %.o linker.ld $(XTENSA_SRC_PATH)/macros.inc $(CRT) Makefile

> -	$(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@

> -

> -build: $(TESTCASES)

> -

> -check: $(addprefix run-, $(TESTCASES))

> -

> -run-%.tst: %.tst

> -	$(SIM) $(SIMFLAGS) ./$<

> -

> -run-test_fail.tst: test_fail.tst

> -	! $(SIM) $(SIMFLAGS) ./$<

> -

> -debug-%.tst: %.tst

> -	$(SIM) $(SIMDEBUG) $(SIMFLAGS) ./$<

> -

> -host-debug-%.tst: %.tst

> -	gdb --args $(SIM) $(SIMFLAGS) ./$<

> -

> -clean:

> -	$(RM) -fr $(TESTCASES) $(CRT) linker.ld

> diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target

> new file mode 100644

> index 0000000000..1a4014506f

> --- /dev/null

> +++ b/tests/tcg/xtensa/Makefile.softmmu-target

> @@ -0,0 +1,40 @@

> +#

> +# Xtensa softmmu tests

> +#

> +

> +ifneq ($(TARGET_WORDS_BIGENDIAN),y)

> +

> +XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa

> +XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S))

> +XTENSA_TESTS = $(patsubst $(XTENSA_SRC)/%.S, %, $(XTENSA_ALL))

> +# Filter out common blobs and broken tests

> +XTENSA_BROKEN_TESTS  = crt vectors test_boolean test_pipeline test_fail

> +XTENSA_USABLE_TESTS = $(filter-out $(XTENSA_BROKEN_TESTS), $(XTENSA_TESTS))

> +

> +# add to the list of tests

> +TESTS += $(XTENSA_USABLE_TESTS)

> +VPATH += $(XTENSA_SRC)

> +

> +CORE=dc232b

> +QEMU_OPTS+=-M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel

> +

> +INCLUDE_DIRS = $(SRC_PATH)/target/xtensa/core-$(CORE)

> +XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS))

> +

> +LDFLAGS = -Tlinker.ld -nostartfiles -nostdlib

> +

> +CRT        = crt.o vectors.o

> +

> +linker.ld: linker.ld.S

> +	$(CC) $(XTENSA_INC) -E -P $< -o $@

> +

> +$(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makefile.softmmu-target

> +

> +# special rule for common blobs

> +%.o: %.S

> +	$(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@

> +

> +%: %.S

> +	$(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT)

> +

> +endif

>
Max Filippov Feb. 28, 2019, 11:24 p.m. UTC | #2 
On Thu, Feb 28, 2019 at 2:54 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
> Max: I think it should be quite easy to port your simulator to Alex's

> new Makefile.


I agree.

> BTW is this simulator downloadable? I see the Zephyr project also uses

> it, and I looked for it on https://ip.cadence.com/swdev but couldnt find

> a (public) link.


There's a site https://www.tensilicatools.com/
with tools for various end-user-programmable xtensa cores,
but I'm pretty sure that neither dc232b nor dc233c are available
there.

-- 
Thanks.
-- Max
Philippe Mathieu-Daudé Feb. 28, 2019, 11:28 p.m. UTC | #3 
On 3/1/19 12:24 AM, Max Filippov wrote:
> On Thu, Feb 28, 2019 at 2:54 PM Philippe Mathieu-Daudé

> <philmd@redhat.com> wrote:

> 

>> BTW is this simulator downloadable? I see the Zephyr project also uses

>> it, and I looked for it on https://ip.cadence.com/swdev but couldnt find

>> a (public) link.

> 

> There's a site https://www.tensilicatools.com/

> with tools for various end-user-programmable xtensa cores,

> but I'm pretty sure that neither dc232b nor dc233c are available

> there.


Thanks!

Phil.
Max Filippov Feb. 28, 2019, 11:29 p.m. UTC | #4 
Hi Alex,

On Thu, Feb 28, 2019 at 12:25 PM Alex Bennée <alex.bennee@linaro.org> wrote:

[...]

> diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target

> new file mode 100644

> index 0000000000..1a4014506f

> --- /dev/null

> +++ b/tests/tcg/xtensa/Makefile.softmmu-target

> @@ -0,0 +1,40 @@

> +#

> +# Xtensa softmmu tests

> +#

> +

> +ifneq ($(TARGET_WORDS_BIGENDIAN),y)


I've recently posted a series that makes it possible to run
TCG tests on wider variety of xtensa cores, including
big-endian cores:
http://lists.nongnu.org/archive/html/qemu-devel/2019-02/msg04843.html

-- 
Thanks.
-- Max
Alex Bennée March 1, 2019, 7:30 a.m. UTC | #5 
Max Filippov <jcmvbkbc@gmail.com> writes:

> Hi Alex,

>

> On Thu, Feb 28, 2019 at 12:25 PM Alex Bennée <alex.bennee@linaro.org> wrote:

>

> [...]

>

>> diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target

>> new file mode 100644

>> index 0000000000..1a4014506f

>> --- /dev/null

>> +++ b/tests/tcg/xtensa/Makefile.softmmu-target

>> @@ -0,0 +1,40 @@

>> +#

>> +# Xtensa softmmu tests

>> +#

>> +

>> +ifneq ($(TARGET_WORDS_BIGENDIAN),y)

>

> I've recently posted a series that makes it possible to run

> TCG tests on wider variety of xtensa cores, including

> big-endian cores:

> http://lists.nongnu.org/archive/html/qemu-devel/2019-02/msg04843.html


Ahh I missed that, will have a look.

--
Alex Bennée
diff mbox series

Patch

diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile
deleted file mode 100644
index 2f5691f75b..0000000000
--- a/tests/tcg/xtensa/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@ 
--include ../../../config-host.mak
-
-CORE=dc232b
-CROSS=xtensa-$(CORE)-elf-
-
-ifndef XT
-SIM = ../../../xtensa-softmmu/qemu-system-xtensa
-SIMFLAGS = -M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel
-SIMDEBUG = -s -S
-else
-SIM = xt-run
-SIMFLAGS = --xtensa-core=DC_B_232L --exit_with_target_code $(EXTFLAGS)
-SIMDEBUG = --gdbserve=0
-endif
-
-HOST_CC = gcc
-CC      = $(CROSS)gcc
-AS      = $(CROSS)gcc -x assembler-with-cpp
-LD      = $(CROSS)ld
-
-XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa
-INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target/xtensa/core-$(CORE)
-XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS))
-
-LDFLAGS = -Tlinker.ld
-
-CRT        = crt.o vectors.o
-
-TESTCASES += test_b.tst
-TESTCASES += test_bi.tst
-#TESTCASES += test_boolean.tst
-TESTCASES += test_break.tst
-TESTCASES += test_bz.tst
-TESTCASES += test_cache.tst
-TESTCASES += test_clamps.tst
-TESTCASES += test_extui.tst
-TESTCASES += test_fail.tst
-TESTCASES += test_interrupt.tst
-TESTCASES += test_loop.tst
-TESTCASES += test_mac16.tst
-TESTCASES += test_max.tst
-TESTCASES += test_min.tst
-TESTCASES += test_mmu.tst
-TESTCASES += test_mul16.tst
-TESTCASES += test_mul32.tst
-TESTCASES += test_nsa.tst
-TESTCASES += test_phys_mem.tst
-ifdef XT
-TESTCASES += test_pipeline.tst
-endif
-TESTCASES += test_quo.tst
-TESTCASES += test_rem.tst
-TESTCASES += test_rst0.tst
-TESTCASES += test_s32c1i.tst
-TESTCASES += test_sar.tst
-TESTCASES += test_sext.tst
-TESTCASES += test_shift.tst
-TESTCASES += test_sr.tst
-TESTCASES += test_timer.tst
-TESTCASES += test_windowed.tst
-
-all: build
-
-linker.ld: $(XTENSA_SRC_PATH)/linker.ld.S
-	$(HOST_CC) $(XTENSA_INC) -E -P $< -o $@
-
-%.o: $(XTENSA_SRC_PATH)/%.c
-	$(CC) $(XTENSA_INC) $(CFLAGS) -c $< -o $@
-
-%.o: $(XTENSA_SRC_PATH)/%.S
-	$(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@
-
-%.tst: %.o linker.ld $(XTENSA_SRC_PATH)/macros.inc $(CRT) Makefile
-	$(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@
-
-build: $(TESTCASES)
-
-check: $(addprefix run-, $(TESTCASES))
-
-run-%.tst: %.tst
-	$(SIM) $(SIMFLAGS) ./$<
-
-run-test_fail.tst: test_fail.tst
-	! $(SIM) $(SIMFLAGS) ./$<
-
-debug-%.tst: %.tst
-	$(SIM) $(SIMDEBUG) $(SIMFLAGS) ./$<
-
-host-debug-%.tst: %.tst
-	gdb --args $(SIM) $(SIMFLAGS) ./$<
-
-clean:
-	$(RM) -fr $(TESTCASES) $(CRT) linker.ld
diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target
new file mode 100644
index 0000000000..1a4014506f
--- /dev/null
+++ b/tests/tcg/xtensa/Makefile.softmmu-target
@@ -0,0 +1,40 @@ 
+#
+# Xtensa softmmu tests
+#
+
+ifneq ($(TARGET_WORDS_BIGENDIAN),y)
+
+XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa
+XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S))
+XTENSA_TESTS = $(patsubst $(XTENSA_SRC)/%.S, %, $(XTENSA_ALL))
+# Filter out common blobs and broken tests
+XTENSA_BROKEN_TESTS  = crt vectors test_boolean test_pipeline test_fail
+XTENSA_USABLE_TESTS = $(filter-out $(XTENSA_BROKEN_TESTS), $(XTENSA_TESTS))
+
+# add to the list of tests
+TESTS += $(XTENSA_USABLE_TESTS)
+VPATH += $(XTENSA_SRC)
+
+CORE=dc232b
+QEMU_OPTS+=-M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel
+
+INCLUDE_DIRS = $(SRC_PATH)/target/xtensa/core-$(CORE)
+XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS))
+
+LDFLAGS = -Tlinker.ld -nostartfiles -nostdlib
+
+CRT        = crt.o vectors.o
+
+linker.ld: linker.ld.S
+	$(CC) $(XTENSA_INC) -E -P $< -o $@
+
+$(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makefile.softmmu-target
+
+# special rule for common blobs
+%.o: %.S
+	$(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@
+
+%: %.S
+	$(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT)
+
+endif