Various testing fixes:

- fix compiler abi for test-armv6m-undef - fix isns suffixes for i386 tcg tests - fix gitlab cfi jobs - fix makefile docker invocation - don't enable xtensa-linux-user builds with system compiler - fix CIRRUS_nn var checking - don't spam the aarch64/32 runners with too many jobs at once -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmKnxfUACgkQ+9DbCVqe KkSksAf/eXGL/k0zUU4RmxmQGWatCPPfbdxWj/pRDJrZl4cvegYK4cqXcfblDkiJ f5kdB4FsSHgJUKic7K7sBSke2xgoi2bvBMeqNIknLo89b+xXZLJSzTE7XCi0W+hm ll3GtHNJMEPjrIhSIAsqiSMFloL5xi7uz+ylBAB49skGF6F3rkCMv4fl7TDFKqaH y5fRzLZMJg+FhlHNwGO0H8O32ZU7FlyqLGQT3JWZywR0n241kQ+gXLykQjQ7//nd 9EbtppXiSOuusbggGCbmUQrEprW93TAEkgxUcuUuQYiAwDp89s66Q0gcwo1qMtcx mORfc+018/WJpBwFF904hBPPjgO08w== =PfzM -----END PGP SIGNATURE----- Merge tag 'pull-testing-next-140622-1' of https://github.com/stsquad/qemu into staging Various testing fixes: - fix compiler abi for test-armv6m-undef - fix isns suffixes for i386 tcg tests - fix gitlab cfi jobs - fix makefile docker invocation - don't enable xtensa-linux-user builds with system compiler - fix CIRRUS_nn var checking - don't spam the aarch64/32 runners with too many jobs at once # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmKnxfUACgkQ+9DbCVqe # KkSksAf/eXGL/k0zUU4RmxmQGWatCPPfbdxWj/pRDJrZl4cvegYK4cqXcfblDkiJ # f5kdB4FsSHgJUKic7K7sBSke2xgoi2bvBMeqNIknLo89b+xXZLJSzTE7XCi0W+hm # ll3GtHNJMEPjrIhSIAsqiSMFloL5xi7uz+ylBAB49skGF6F3rkCMv4fl7TDFKqaH # y5fRzLZMJg+FhlHNwGO0H8O32ZU7FlyqLGQT3JWZywR0n241kQ+gXLykQjQ7//nd # 9EbtppXiSOuusbggGCbmUQrEprW93TAEkgxUcuUuQYiAwDp89s66Q0gcwo1qMtcx # mORfc+018/WJpBwFF904hBPPjgO08w== # =PfzM # -----END PGP SIGNATURE----- # gpg: Signature made Mon 13 Jun 2022 04:19:17 PM PDT # gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [undefined] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 * tag 'pull-testing-next-140622-1' of https://github.com/stsquad/qemu: .gitlab: use less aggressive nproc on our aarch64/32 runners gitlab: compare CIRRUS_nn vars against 'null' not "" tests/tcg: disable xtensa-linux-user again tests/docker: fix the IMAGE for build invocation gitlab-ci: Fix the build-cfi-aarch64 and build-cfi-ppc64-s390x jobs tests/tcg/i386: Use explicit suffix on fist insns test/tcg/arm: Use -mfloat-abi=soft for test-armv6m-undef Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
2022-06-13 21:10:57 -07:00 · 2022-06-13 21:10:57 -07:00 · debd075366
parent dcb40541eb b56d1ee951
commit debd075366
9 changed files with 44 additions and 43 deletions
--- a/.gitlab-ci.d/base.yml
+++ b/.gitlab-ci.d/base.yml
@ -13,7 +13,7 @@
    #############################################################

    # Cirrus jobs can't run unless the creds / target repo are set
-    - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == "" || $CIRRUS_API_TOKEN == "")'
+    - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null)'
      when: never

    # Publishing jobs should only run on the default branch in upstream
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@ -357,16 +357,15 @@ build-cfi-aarch64:
      --enable-safe-stack --enable-slirp=git
    TARGETS: aarch64-softmmu
    MAKE_CHECK_ARGS: check-build
-  timeout: 70m
-  artifacts:
-    expire_in: 2 days
-    paths:
-      - build
-  variables:
    # FIXME: This job is often failing, likely due to out-of-memory problems in
    # the constrained containers of the shared runners. Thus this is marked as
    # skipped until the situation has been solved.
    QEMU_JOB_SKIPPED: 1
+  timeout: 90m
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - build

 check-cfi-aarch64:
  extends: .native_test_job_template
@ -398,16 +397,15 @@ build-cfi-ppc64-s390x:
      --enable-safe-stack --enable-slirp=git
    TARGETS: ppc64-softmmu s390x-softmmu
    MAKE_CHECK_ARGS: check-build
-  timeout: 70m
-  artifacts:
-    expire_in: 2 days
-    paths:
-      - build
-  variables:
    # FIXME: This job is often failing, likely due to out-of-memory problems in
    # the constrained containers of the shared runners. Thus this is marked as
    # skipped until the situation has been solved.
    QEMU_JOB_SKIPPED: 1
+  timeout: 80m
+  artifacts:
+    expire_in: 2 days
+    paths:
+      - build

 check-cfi-ppc64-s390x:
  extends: .native_test_job_template
--- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml
@ -19,5 +19,5 @@ ubuntu-20.04-aarch32-all:
 - mkdir build
 - cd build
 - ../configure --cross-prefix=arm-linux-gnueabihf-
- - make --output-sync -j`nproc`
- - make --output-sync -j`nproc` check V=1
+ - make --output-sync -j`nproc --ignore=40`
+ - make --output-sync -j`nproc --ignore=40` check V=1
--- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml
@ -17,9 +17,9 @@ ubuntu-20.04-aarch64-all-linux-static:
 - mkdir build
 - cd build
 - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh
- - make --output-sync -j`nproc`
- - make --output-sync -j`nproc` check V=1
- - make --output-sync -j`nproc` check-tcg V=1
+ - make --output-sync -j`nproc --ignore=40`
+ - make --output-sync -j`nproc --ignore=40` check V=1
+ - make --output-sync -j`nproc --ignore=40` check-tcg V=1

 ubuntu-20.04-aarch64-all:
 needs: []
@ -38,8 +38,8 @@ ubuntu-20.04-aarch64-all:
 - mkdir build
 - cd build
 - ../configure --disable-libssh
- - make --output-sync -j`nproc`
- - make --output-sync -j`nproc` check V=1
+ - make --output-sync -j`nproc --ignore=40`
+ - make --output-sync -j`nproc --ignore=40` check V=1

 ubuntu-20.04-aarch64-alldbg:
 needs: []
@ -55,8 +55,8 @@ ubuntu-20.04-aarch64-alldbg:
 - cd build
 - ../configure --enable-debug --disable-libssh
 - make clean
- - make --output-sync -j`nproc`
- - make --output-sync -j`nproc` check V=1
+ - make --output-sync -j`nproc --ignore=40`
+ - make --output-sync -j`nproc --ignore=40` check V=1

 ubuntu-20.04-aarch64-clang:
 needs: []
@ -75,8 +75,8 @@ ubuntu-20.04-aarch64-clang:
 - mkdir build
 - cd build
 - ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers
- - make --output-sync -j`nproc`
- - make --output-sync -j`nproc` check V=1
+ - make --output-sync -j`nproc --ignore=40`
+ - make --output-sync -j`nproc --ignore=40` check V=1

 ubuntu-20.04-aarch64-tci:
 needs: []
@ -95,7 +95,7 @@ ubuntu-20.04-aarch64-tci:
 - mkdir build
 - cd build
 - ../configure --disable-libssh --enable-tcg-interpreter
- - make --output-sync -j`nproc`
+ - make --output-sync -j`nproc --ignore=40`

 ubuntu-20.04-aarch64-notcg:
 needs: []
@ -114,5 +114,5 @@ ubuntu-20.04-aarch64-notcg:
 - mkdir build
 - cd build
 - ../configure --disable-libssh --disable-tcg
- - make --output-sync -j`nproc`
- - make --output-sync -j`nproc` check V=1
+ - make --output-sync -j`nproc --ignore=40`
+ - make --output-sync -j`nproc --ignore=40` check V=1
--- a/5
+++ b/5
@ -2024,7 +2024,6 @@ probe_target_compiler() {
        container_cross_prefix=x86_64-linux-gnu-
        ;;
      xtensa*)
-        # FIXME: xtensa-linux-user?
        container_hosts=x86_64
        container_image=debian-xtensa-cross

@ -2481,6 +2480,10 @@ for target in $target_list; do
  echo "# Automatically generated by configure - do not modify" > $config_target_mak
  echo "TARGET_NAME=$arch" >> $config_target_mak
  case $target in
+    xtensa*-linux-user)
+      # the toolchain is not complete with headers, only build softmmu tests
+      continue
+      ;;
    *-softmmu)
      test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || continue
      qemu="qemu-system-$arch"
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@ -171,7 +171,7 @@ DOCKER_TESTS := $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS))
 $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
 	$(foreach t,$(DOCKER_TESTS), \
 		$(eval .PHONY: docker-$t@$i) \
-		$(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=$t IMAGE=$i) \
+		$(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=$t IMAGE=qemu/$i) \
 	) \
 	$(foreach t,$(DOCKER_TESTS), \
 		$(eval docker-all-tests: docker-$t@$i) \
--- a/tests/tcg/arm/Makefile.softmmu-target
+++ b/tests/tcg/arm/Makefile.softmmu-target
@ -20,7 +20,7 @@ LDFLAGS+=-nostdlib -N -static

 # Specific Test Rules

-test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0
+test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 -mfloat-abi=soft

 run-test-armv6m-undef: QEMU_OPTS+=-semihosting -M microbit -kernel
 run-plugin-test-armv6m-undef-%: QEMU_OPTS+=-semihosting -M microbit -kernel
--- a/tests/tcg/i386/test-i386-fp-exceptions.c
+++ b/tests/tcg/i386/test-i386-fp-exceptions.c
@ -423,35 +423,35 @@ int main(void)
    }

    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (1.5L) : "st");
+    __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (1.5L) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != PE) {
        printf("FAIL: fistp inexact\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (32767.5L) : "st");
+    __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (32767.5L) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
        printf("FAIL: fistp 32767.5\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (-32768.51L) : "st");
+    __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (-32768.51L) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
        printf("FAIL: fistp -32768.51\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (ld_nan) : "st");
+    __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (ld_nan) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
        printf("FAIL: fistp nan\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) :
+    __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) :
                      "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
@ -538,49 +538,49 @@ int main(void)
    }

    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (1.5L) : "st");
+    __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (1.5L) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != PE) {
        printf("FAIL: fisttp inexact\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (32768.0L) : "st");
+    __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (32768.0L) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
        printf("FAIL: fisttp 32768\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (32768.5L) : "st");
+    __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (32768.5L) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
        printf("FAIL: fisttp 32768.5\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (-32769.0L) : "st");
+    __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (-32769.0L) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
        printf("FAIL: fisttp -32769\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (-32769.5L) : "st");
+    __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (-32769.5L) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
        printf("FAIL: fisttp -32769.5\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (ld_nan) : "st");
+    __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (ld_nan) : "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
        printf("FAIL: fisttp nan\n");
        ret = 1;
    }
    __asm__ volatile ("fnclex");
-    __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) :
+    __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) :
                      "st");
    __asm__ volatile ("fnstsw" : "=a" (sw));
    if ((sw & EXC) != IE) {
--- a/tests/tcg/i386/test-i386.c
+++ b/tests/tcg/i386/test-i386.c
@ -866,7 +866,7 @@ void test_fcvt(double a)
        uint16_t val16;
        val16 = (fpuc & ~0x0c00) | (i << 10);
        asm volatile ("fldcw %0" : : "m" (val16));
-        asm volatile ("fist %0" : "=m" (wa) : "t" (a));
+        asm volatile ("fists %0" : "=m" (wa) : "t" (a));
        asm volatile ("fistl %0" : "=m" (ia) : "t" (a));
        asm volatile ("fistpll %0" : "=m" (lla) : "t" (a) : "st");
        asm volatile ("frndint ; fstl %0" : "=m" (ra) : "t" (a));