From patchwork Mon Jul 22 16:28:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1963333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Y5W+pwAS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WSQm75qXlz20Dw for ; Tue, 23 Jul 2024 02:32:07 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0D0273861004 for ; Mon, 22 Jul 2024 16:32:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 63FFA385DDCA for ; Mon, 22 Jul 2024 16:30:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 63FFA385DDCA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 63FFA385DDCA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665871; cv=none; b=G0vs4PY/TzwKgfM7YHSDTY//saEaidnjKf4/9bWmfNF7Mm7nywHmICyKmAYocCUqNQjojlXOjOa6NjCX6BXt10LXyguLeSqlOFfk+AZjYZU9GX7sVzFAZgjTQFMXxOb6Zm3GoVE+HwnvWmQ4ArcKnVUX/T5y2nzm2NelBGppjJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721665871; c=relaxed/simple; bh=Jqz3qeO5c+OVj3LQ0ksjaGUkYCvNCIu81RKalZLsTd8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=aMEBxz0sFuuqsEaFyXMj7dfGNzpKJctsiE0XMd6bOUjQYEErydpfrLWYa9KKnajdK0sDIkTURtNnI2DBPnENMvGcklbz6FtmN+wNAznuEb9QEZrxqi1AXdjLjOCWOJFkCzkKdYJazhM4oXQuMVU8mqnzxGBcHEbEhyEWLkOocbU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721665830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PQ7E/HZdeVG+9QmqkF/rRXn26fMF7xK+C63Hr5/8KtM=; b=Y5W+pwASt+X4IuNF921FdaDTOktwgVEsdL3VdOYASCQ/Sd5CvJ+3+QGFrAxldmt9VeCaTv xEQmwl1PPWAif7RaR2KwgmECHsyyvHTEp+EbNhP7APmW5DDut90juw37Y9ICRUL07dgp3+ hvN9pdRDXeB3//LwpH625vQAAIHzwlo= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-29-Adi3Xl5ZOZiq5iBp2751lg-1; Mon, 22 Jul 2024 12:30:26 -0400 X-MC-Unique: Adi3Xl5ZOZiq5iBp2751lg-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 08F36195421D; Mon, 22 Jul 2024 16:30:26 +0000 (UTC) Received: from localhost (unknown [10.42.28.14]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 52B6F195605F; Mon, 22 Jul 2024 16:30:25 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 6/8] libstdc++: Use dg-additional-files in some non-I/O tests Date: Mon, 22 Jul 2024 17:28:40 +0100 Message-ID: <20240722163010.3508334-6-jwakely@redhat.com> In-Reply-To: <20240722163010.3508334-1-jwakely@redhat.com> References: <20240722163010.3508334-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested x86_64-linux. -- >8 -- libstdc++-v3/ChangeLog: * testsuite/20_util/hash/chi2_q_document_words.cc: Use dg-additional-files for input text. * testsuite/performance/ext/pb_ds/all_text_find.cc: Likewise. * testsuite/performance/ext/pb_ds/multimap_text_find.hpp: Likewise. * testsuite/performance/ext/pb_ds/multimap_text_insert.hpp: Likewise. * testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_join.cc: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_push.cc: Likewise. * testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc: Likewise. * testsuite/performance/ext/pb_ds/tree_text_insert.cc: Likewise. * testsuite/performance/ext/pb_ds/tree_text_lor_find.cc: Likewise. --- libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc | 2 ++ libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc | 2 ++ .../testsuite/performance/ext/pb_ds/multimap_text_find.hpp | 2 ++ .../testsuite/performance/ext/pb_ds/multimap_text_insert.hpp | 2 ++ .../performance/ext/pb_ds/multimap_text_insert_mem.hpp | 2 ++ .../testsuite/performance/ext/pb_ds/priority_queue_text_join.cc | 2 ++ .../performance/ext/pb_ds/priority_queue_text_modify.hpp | 2 ++ .../performance/ext/pb_ds/priority_queue_text_pop_mem.cc | 2 ++ .../testsuite/performance/ext/pb_ds/priority_queue_text_push.cc | 2 ++ .../performance/ext/pb_ds/priority_queue_text_push_pop.cc | 2 ++ .../testsuite/performance/ext/pb_ds/tree_text_insert.cc | 2 ++ .../testsuite/performance/ext/pb_ds/tree_text_lor_find.cc | 2 ++ 12 files changed, 24 insertions(+) diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc index a6ebc0011eb..3c77527c27c 100644 --- a/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc +++ b/libstdc++-v3/testsuite/20_util/hash/chi2_q_document_words.cc @@ -19,6 +19,8 @@ // along with this library; see the file COPYING3. If not see // . +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + #include "chi2_quality.h" // Tests chi^2 for a set of words taken from a document written in English. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc index 13c73a76647..df822c3d5f7 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/all_text_find.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file text_find_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp index 18e383ea17c..dbaaf04a1b6 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find.hpp @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file multimap_text_find_timing_test.cpp * Contains test for inserting text words. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp index 737be39a154..2c86b52f30a 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert.hpp @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file multimap_text_insert_timing_test.cpp * Contains test for inserting text words. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp index 9ce235381bd..ab755312c69 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem.hpp @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file multimap_text_insert_mem_usage_test.cpp * Contains test for inserting text words. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc index a515eea8009..aee52539fce 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_join_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp index cb62b616105..108b67284c3 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify.hpp @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_modify_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc index 0a1003fe0f5..862de9858f9 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_push_pop_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc index 5a25a9a1925..4ba1fa3174a 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_push_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc index 4013cd28be0..0a1280962ec 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file priority_queue_text_push_pop_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc index 760006ec5ca..f439cad0c4e 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file tree_text_insert_timing_test.cpp * Contains test for finding text. diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc index 53ed5538101..04dabccf74e 100644 --- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc +++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find.cc @@ -29,6 +29,8 @@ // purpose. It is provided "as is" without express or implied // warranty. +// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" } + /** * @file tree_text_lor_find_timing_test.cpp * Contains test for finding text with locality of reference.