From patchwork Thu Aug 8 06:30:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1143849 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-506478-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="sq1orK5t"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 463z6Z5M0sz9sNx for ; Thu, 8 Aug 2019 16:31:33 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=xfwroGo3xXT0Nnfg BBB+LMjf+p79Qksvpp8lvp7vffAOvifJqOObEFIgKLNEKjLzlPyaUWb2jdSpwqsK /0aceaI4i4Pk3kznCKYHwPSdCqfi8c8EaPUW4m7nIG3Hlx8zPPlSfd/Jf7CRJu1E LUj3b4igo3RRIAw9llfJ4mgHYdE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=default; bh=xGHF/LRCl8xle7MiPPSJiB 8ukBc=; b=sq1orK5t9MciBpZ4n0p1MuB1gCLDlxJeilRO1HS8pwS0aAJ5E/YRVb BNXbzMyuzemmS6THDS8EtTFrbY4qjB1dsUPFzwAnHdb0hhNHuEtR6ArSxurfcVTl 1thmtXt+PeWvK7khkmIxsFUbd2qjTcSJmO87f5K9q4aQBXQPq+8sA= Received: (qmail 1996 invoked by alias); 8 Aug 2019 06:31:25 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 1982 invoked by uid 89); 8 Aug 2019 06:31:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=che, ISO, free!, que X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Aug 2019 06:31:22 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 6C85E11624A; Thu, 8 Aug 2019 02:31:20 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 25Ur4PLVhO2X; Thu, 8 Aug 2019 02:31:20 -0400 (EDT) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 8922E116246; Thu, 8 Aug 2019 02:31:19 -0400 (EDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id x786UtG61366589 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 8 Aug 2019 03:31:00 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: Uros Bizjak , David Edelsohn , Segher Boessenkool , Rainer Orth Subject: [testsuite] use rand instead of random Date: Thu, 08 Aug 2019 03:30:55 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 rand is in ISO C, whereas random is only in POSIX, so it makes sense to use the more portable function everywhere instead of falling back from one to the other on systems that miss the less portable one. Tested on x86_64-linux-gnu, native and cross to ppc. Ok to install? for gcc/testsuite/ChangeLog * gcc.target/i386/sse2-mul-1.c: Use rand. Drop fallback. * gcc.target/i386/sse4_1-blendps-2.c: Likewise. * gcc.target/i386/sse4_1-blendps.c: Likewise. * gcc.target/i386/xop-vshift-1.c: Likewise. * gcc.target/powerpc/direct-move.h: Likewise. --- gcc/testsuite/gcc.target/i386/sse2-mul-1.c | 13 ++++--------- gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c | 7 +------ gcc/testsuite/gcc.target/i386/sse4_1-blendps.c | 7 +------ gcc/testsuite/gcc.target/i386/xop-vshift-1.c | 9 ++------- gcc/testsuite/gcc.target/powerpc/direct-move.h | 2 +- 5 files changed, 9 insertions(+), 29 deletions(-) diff --git a/gcc/testsuite/gcc.target/i386/sse2-mul-1.c b/gcc/testsuite/gcc.target/i386/sse2-mul-1.c index 9cdc12763b0b9..af63d245d7916 100644 --- a/gcc/testsuite/gcc.target/i386/sse2-mul-1.c +++ b/gcc/testsuite/gcc.target/i386/sse2-mul-1.c @@ -14,11 +14,6 @@ #include -/* mingw runtime don't provide random(). */ -#ifdef __MINGW32__ -#define random rand -#endif - #define N 512 static short a1[N], a2[N], a3[N]; static unsigned short b1[N], b2[N], b3[N]; @@ -160,12 +155,12 @@ TEST (void) asm volatile ("" : : "r" (&s2) : "memory"); asm volatile ("" : : "r" (&s3) : "memory"); asm volatile ("" : : "r" (&s4) : "memory"); - b2[i] = (int) random (); - b3[i] = (int) random (); + b2[i] = (int) rand (); + b3[i] = (int) rand (); a2[i] = b2[i]; a3[i] = b3[i]; - d2[i] = (((int) random ()) << 16) | b2[i]; - d3[i] = (((int) random ()) << 16) | b3[i]; + d2[i] = (((int) rand ()) << 16) | b2[i]; + d3[i] = (((int) rand ()) << 16) | b3[i]; c2[i] = d2[i]; c3[i] = d3[i]; s1 += a2[i] * a3[i]; diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c b/gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c index 8fe71b71c576a..512394ea37a00 100644 --- a/gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c +++ b/gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c @@ -8,11 +8,6 @@ #include #include -/* mingw runtime don't provide random(). */ -#ifdef __MINGW32__ -#define random rand -#endif - #define NUM 20 #undef MASK @@ -64,7 +59,7 @@ sse4_1_test (void) init_blendps (src1.f, src2.f); for (i = 0; i < 4; i++) - src3.f[i] = (int) random (); + src3.f[i] = (int) rand (); /* Check blendps imm8, m128, xmm */ for (i = 0; i < NUM; i++) diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c b/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c index 3f4b335aca6ae..556094bf9530e 100644 --- a/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c +++ b/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c @@ -16,11 +16,6 @@ #include #include -/* mingw runtime don't provide random(). */ -#ifdef __MINGW32__ -#define random rand -#endif - #define NUM 20 #ifndef MASK @@ -73,7 +68,7 @@ TEST (void) init_blendps (src1.f, src2.f); for (i = 0; i < 4; i++) - src3.f[i] = (int) random (); + src3.f[i] = (int) rand (); /* Check blendps imm8, m128, xmm */ for (i = 0; i < NUM; i++) diff --git a/gcc/testsuite/gcc.target/i386/xop-vshift-1.c b/gcc/testsuite/gcc.target/i386/xop-vshift-1.c index ee3d2990390ab..f3713e8ffc656 100644 --- a/gcc/testsuite/gcc.target/i386/xop-vshift-1.c +++ b/gcc/testsuite/gcc.target/i386/xop-vshift-1.c @@ -19,11 +19,6 @@ #define TYPE2 long long #endif -/* mingw runtime don't provide random(). */ -#ifdef __MINGW32__ -#define random rand -#endif - signed TYPE1 a[N], b[N], g[N]; unsigned TYPE1 c[N], h[N]; signed TYPE2 d[N], e[N], j[N]; @@ -108,10 +103,10 @@ TEST () for (i = 0; i < N; i++) { asm (""); - c[i] = (random () << 1) | (random () & 1); + c[i] = (rand () << 1) | (rand () & 1); b[i] = (i * 85) & (sizeof (TYPE1) * __CHAR_BIT__ - 1); a[i] = c[i]; - d[i] = (random () << 1) | (random () & 1); + d[i] = (rand () << 1) | (rand () & 1); d[i] |= (unsigned long long) c[i] << 32; e[i] = (i * 85) & (sizeof (TYPE2) * __CHAR_BIT__ - 1); f[i] = d[i]; diff --git a/gcc/testsuite/gcc.target/powerpc/direct-move.h b/gcc/testsuite/gcc.target/powerpc/direct-move.h index e29f10f5cd54f..80874adcea1ae 100644 --- a/gcc/testsuite/gcc.target/powerpc/direct-move.h +++ b/gcc/testsuite/gcc.target/powerpc/direct-move.h @@ -179,7 +179,7 @@ main (void) for (j = 0; j < 10; j++) { for (i = 0; i < sizeof (TYPE); i++) - u.bytes[i] = (unsigned char) (random () >> 4); + u.bytes[i] = (unsigned char) (rand () >> 4); test_value (u.value); }