From patchwork Fri Apr 5 12:17:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 88080 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5C8423858431 for ; Fri, 5 Apr 2024 12:18:27 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 9E9AF3858C24 for ; Fri, 5 Apr 2024 12:17:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E9AF3858C24 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=baylibre.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9E9AF3858C24 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712319478; cv=none; b=ZEdNqHmT6pgyLgugREaQyriLppatPUN4Q68C/6bkBErmgixdu7Ibk/LUPNshsk0tSGRKzojMXFJ5a9+ftenrW4uQZL/7D+jOL1zRf8nFPN4VrIWDWb+kZOK9nz+clLpcMB4aTrLCCGlo7nIDCPIO31tvBdGx2W5U7rHxRl2/uSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712319478; c=relaxed/simple; bh=b2P9se8La9lsCEcL9rFwAZ88T1nzepHYgDBRIy3Q8eo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=MzxQul+N3H9WXPhIMUceGY2uIF9pNJhh/k9kLlw1QtZA3RswV0sBAN7L4lBltYDdo9H2BK2iuc2x+3vuKG9jj7u0HyfFqDDfiSnB6HF6lfINgVtBO737G0RUsB4zwBqy8Z8q98bZ16pqDclPsqg8E8sBdgSRYYM45XSuu+3XQnk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-34388753650so954433f8f.3 for ; Fri, 05 Apr 2024 05:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1712319475; x=1712924275; darn=gcc.gnu.org; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=1Fc4FkBKAw+W2JxQwbwtGHuqUvxxHdqfUPWbONK6Woo=; b=k11eV3mDrrJ9JtAbunkUZUSO3utKiUSsAHHYmr+ghc8xx2P70/nGBbOYjRSBSybXSl lRFz8AmfND1iXZBrCosVkFSnlwqT26HTQuCtIOil2BPBlomQLjs+4Nywq/lFEP4RPDLl B56UNiAD7L+hezmfq4iVhKsJXAF9GboFYAD5EJ0S09SUqRYd0jafwmIKt4XZNeHY17qA Vf5FE0Pgwdwwery2XWmwdrsYeXN8y4gIuTMPhdrfqhrXIPeU8sF8bY7MBPxrkQgu0I6F 9/nJxwdFy3bmyOSwqkPqgloTS1a6F0xGhM2DNnIeeGE+Yigt78ErCUP+gNYGh7/r7GZj DSCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712319475; x=1712924275; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1Fc4FkBKAw+W2JxQwbwtGHuqUvxxHdqfUPWbONK6Woo=; b=PkkF3jizPNppFV04APFWv0TIh5DHgEfYj0huX6p51Xd5mUpD8HRaoUjIY1l79cYSic w+Ip0mM/ScMtIWBK3ZKTelyDhm/OAWmMj4Zzw0eCBrHLisIiPh5MkLmAg1dRyES5G29B 0ytGLSvcruhixX3fyd3FVYqgIL7M5ZeVFSRWDKfONPt0JmA3rfmIfTdrKfsNFNwh3KQg c/cJ9OqwqQdgri/Y456DqFSSJsRWKAj0OvdaQ1+INqe51cBKDp8R8U4ekLtoO/YVIUAg 4DDyDMIOLWNLdbDgs8n0wy/Amg3zje6WLOJ5f72e/8iZI5c9OAMlyzfL8bA1PZkydylI 2SvQ== X-Forwarded-Encrypted: i=1; AJvYcCXifo6VGM6CtAsKTeHDtJnGtaFXIOmrO5BsdIifYyxGfDMZ55b38HET8LoK2mNQtpDAhY6oqxy2RtFDwZJzpO6IJrHMs5Pl5A== X-Gm-Message-State: AOJu0YwMVFr8u/tF/6ZOpZNBqt8mqRglbjm0EA+V0P9/C6Njl7bd6B5O sgsvrUVqNL2skwvSbLXPeEboxiRcXIjaLS9ILYV8+rltLrg8Isx8UDjMvyWDNmA= X-Google-Smtp-Source: AGHT+IF16c0VN+oweuDSac+i+N89gTAzQsYYq8RDkOXzWJj8MIfCpOWSvVwbvKLuz4DP/bZNd6oH+w== X-Received: by 2002:adf:ef4c:0:b0:343:61bb:115d with SMTP id c12-20020adfef4c000000b0034361bb115dmr1031656wrp.26.1712319475077; Fri, 05 Apr 2024 05:17:55 -0700 (PDT) Received: from euler.schwinge.homeip.net (p200300c8b70336000b0134869109dcb1.dip0.t-ipconnect.de. [2003:c8:b703:3600:b01:3486:9109:dcb1]) by smtp.gmail.com with ESMTPSA id u3-20020a5d6ac3000000b00341d9e8cc62sm1873271wrw.100.2024.04.05.05.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 05:17:54 -0700 (PDT) From: Thomas Schwinge To: Tobias Burnus , Cc: Tom de Vries Subject: nvptx: In mkoffload.cc, call diagnostic_color_init + gcc_init_libintl: Restore 'libgomp.c/reverse-offload-sm30.c' testing (was: [Patch] nvptx: In mkoffload.cc, call diagnostic_color_init + gcc_init_libintl) In-Reply-To: <8f2b8bb3-c30d-4d57-9be8-31618c168cf2@baylibre.com> References: <8f2b8bb3-c30d-4d57-9be8-31618c168cf2@baylibre.com> User-Agent: Notmuch/0.30+8~g47a4bad (https://notmuchmail.org) Emacs/29.2 (x86_64-pc-linux-gnu) Date: Fri, 05 Apr 2024 14:17:52 +0200 Message-ID: <87a5m8ngun.fsf@euler.schwinge.ddns.net> MIME-Version: 1.0 X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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+patchwork=sourceware.org@gcc.gnu.org Hi! On 2024-04-03T14:06:45+0200, Tobias Burnus wrote: > Nvptx's mkoffload.cc contains 14 'fatal_error' calls and one 'warning_at' call, > which stands out more clearly (color, bold) when enabling > diagnostic_color_init > which this patch does. — Additionally, the call gcc_init_libintl permits that > the already translated error messages also show up as translation. > > OK for mainline? But you've not regression-tested this? Pushed to trunk branch commit 679f81a32f706645f45900fdb1659fb5fe607f77 "nvptx: In mkoffload.cc, call diagnostic_color_init + gcc_init_libintl: Restore 'libgomp.c/reverse-offload-sm30.c' testing", see attached. Instead of adding support for all the '-fdiagnostics-color' variants, I suppose we should rather switch the 'mkoffload's to use GCC's standard option handling machinery (like in 'gcc/lto-wrapper.cc', for example)? Grüße Thomas > PS: Example: 'nvptx mkoffload:' is bold and 'fatal error:' is in red > in English and some language variants. > > nvptx mkoffload: fatal error: COLLECT_GCC must be set. > nvptx mkoffload: 致命的エラー: COLLECT_GCC must be set. > nvptx mkoffload: erreur fatale: COLLECT_GCC doit être défini. > nvptx mkoffload: schwerwiegender Fehler: COLLECT_GCC muss gesetzt sein. > > (BTW: It looks as if many languages did not translate the error string > itself, e.g. jp or zh or pl or zh_TW/zh_CN or fi or ...) > nvptx: In mkoffload.cc, call diagnostic_color_init + gcc_init_libintl > > gcc/ChangeLog: > > * config/nvptx/mkoffload.cc (main): Call > gcc_init_libintl and diagnostic_color_init. > > gcc/config/nvptx/mkoffload.cc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/gcc/config/nvptx/mkoffload.cc b/gcc/config/nvptx/mkoffload.cc > index a7fc28cbd3f..503b1abcefd 100644 > --- a/gcc/config/nvptx/mkoffload.cc > +++ b/gcc/config/nvptx/mkoffload.cc > @@ -638,7 +638,9 @@ main (int argc, char **argv) > const char *outname = 0; > > progname = tool_name; > + gcc_init_libintl (); > diagnostic_initialize (global_dc, 0); > + diagnostic_color_init (global_dc); > > if (atexit (mkoffload_cleanup) != 0) > fatal_error (input_location, "atexit failed"); From 679f81a32f706645f45900fdb1659fb5fe607f77 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 5 Apr 2024 14:04:53 +0200 Subject: [PATCH] nvptx: In mkoffload.cc, call diagnostic_color_init + gcc_init_libintl: Restore 'libgomp.c/reverse-offload-sm30.c' testing With commit 7520a4992c94254016085a461c58c972497c4483 "nvptx: In mkoffload.cc, call diagnostic_color_init + gcc_init_libintl", we regressed: [-PASS:-]{+FAIL:+} libgomp.c/reverse-offload-sm30.c at line 15 (test for warnings, line ) [-PASS:-]{+FAIL:+} libgomp.c/reverse-offload-sm30.c (test for excess errors) libgomp/ * testsuite/libgomp.c/reverse-offload-sm30.c: Set 'GCC_COLORS' to the empty string. --- libgomp/testsuite/libgomp.c/reverse-offload-sm30.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libgomp/testsuite/libgomp.c/reverse-offload-sm30.c b/libgomp/testsuite/libgomp.c/reverse-offload-sm30.c index 7f10fd4ded9..cae75f03462 100644 --- a/libgomp/testsuite/libgomp.c/reverse-offload-sm30.c +++ b/libgomp/testsuite/libgomp.c/reverse-offload-sm30.c @@ -12,4 +12,7 @@ main () return 0; } +/* The 'mkoffload's currently don't obey '-fno-diagnostics-color' etc., so use a different way to effect the same thing: + { dg-set-compiler-env-var GCC_COLORS "" } + ..., so that the following regexp doesn't have to deal with color code escape sequences. */ /* { dg-warning "'omp requires reverse_offload' requires at least 'sm_35' for '-foffload-options=nvptx-none=-march=' - disabling offload-code generation for this device type" "" { target *-*-* } 0 } */ -- 2.34.1