From patchwork Wed Apr 6 10:02:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1613901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYKpD47ZVz9sCD for ; Wed, 6 Apr 2022 20:03:16 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6CCB23851C07 for ; Wed, 6 Apr 2022 10:03:14 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id A57F0385741D for ; Wed, 6 Apr 2022 10:02:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A57F0385741D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.90,239,1643702400"; d="scan'208,223";a="73918898" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 06 Apr 2022 02:02:23 -0800 IronPort-SDR: gFnu5EmwcpiM/UPEe0Ca0RUZgqANQAZo3UZp67wKPcPiuyzhhyWEkHVkAhbqe6zJ19DPmetx9A 1RTdaSO4WM2NAkD5lUT1WSjfHUlQHQud5lLhDClJ4epIuG4rtzW++zt67DSqlyK5ctNBfMMaht n/uftAuKbiCx2Kg+b/zU5T9+XA99SVV+4IQFqIHRxT7PaRNd2buKxgBEqXzzdpYg6n9wIGP5C+ WsBdqF/numXar6I0Ja0K4nXBTsgjRm0YAPbQjql1QV1GjXEXWVVdQe/Whii/wm2aS3FoUYmQWf y0k= From: Thomas Schwinge To: , Andrew Stubbs , Julian Brown Subject: libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library (was: [PATCH 1/4] Remove build dependence on HSA run-time) In-Reply-To: <87o8hrindc.fsf@euler.schwinge.homeip.net> References: <20161118102310.GP3541@tucnak.redhat.com> <20161122132744.lrxg63wvfa3qfvhf@virgil.suse.cz> <87o8hrindc.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Wed, 6 Apr 2022 12:02:08 +0200 Message-ID: <878rsittr3.fsf@dem-tschwing-1.ger.mentorg.com> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jakub Jelinek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi! On 2021-01-14T15:50:23+0100, I wrote: > I'm raising here an issue with HSA libgomp plugin code changes from a > while ago. While HSA is now no longer relevant for GCC master branch, > the same code has also been copied into the GCN libgomp plugin. Here is another small clean-up patch (to enable further clean-up): > This is commit b8d89b03db5f212919e4571671ebb4f5f8b1e19d (r242749) "Remove > build dependence on HSA run-time": > > On 2016-11-22T14:27:44+0100, Martin Jambor wrote: >> --- a/libgomp/plugin/configfrag.ac >> +++ b/libgomp/plugin/configfrag.ac > >> @@ -195,8 +183,8 @@ if test x"$enable_offload_targets" != x; then >> tgt_name=hsa >> PLUGIN_HSA=$tgt >> PLUGIN_HSA_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS >> - PLUGIN_HSA_LDFLAGS="$HSA_RUNTIME_LDFLAGS $HSA_KMT_LDFLAGS" >> - PLUGIN_HSA_LIBS="-lhsa-runtime64 -lhsakmt" >> + PLUGIN_HSA_LDFLAGS="$HSA_RUNTIME_LDFLAGS" >> + PLUGIN_HSA_LIBS="-ldl" > > So this switched from directly linking against 'libhsa-runtime64.so' to a > 'libdl'-based runtime linking variant. (Not intending to change anything regarding that.) Given the 'PLUGIN_HSA_LIBS' change cited above, OK to push the attached "libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library"? Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 5e28a267a34282e4d6001e5f89a3b7bd7a0f20c7 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 6 Apr 2022 11:31:45 +0200 Subject: [PATCH] libgomp GCN plugin: Clean up unused references to system-provided HSA Runtime library This is only active if GCC is 'configure'd with '--with-hsa-runtime=[...]' or '--with-hsa-runtime-include=[...]', '--with-hsa-runtime-lib=[...]' -- which nobody really is doing, as far as I can tell. Originally changed for the libgomp HSA plugin in commit b8d89b03db5f212919e4571671ebb4f5f8b1e19d (r242749) "Remove build dependence on HSA run-time", and later propagated into the GCN plugin, these are no longer built against system-provided HSA Runtime library. Instead, unconditionally built against the GCC-shipped 'include/hsa*.h' header files, and at run time does 'dlopen("libhsa-runtime64.so.1")'. It thus doesn't make sense to consider references to system-provided HSA Runtime library during libgomp GCN plugin build. libgomp/ * plugin/configfrag.ac (HSA_RUNTIME_CPPFLAGS) (HSA_RUNTIME_LDFLAGS): Remove. * configure: Regenerate. --- libgomp/configure | 10 ---------- libgomp/plugin/configfrag.ac | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/libgomp/configure b/libgomp/configure index a73a6d44003..8bb67c650a6 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15244,8 +15244,6 @@ HSA_RUNTIME_INCLUDE= HSA_RUNTIME_LIB= -HSA_RUNTIME_CPPFLAGS= -HSA_RUNTIME_LDFLAGS= # Check whether --with-hsa-runtime was given. @@ -15275,12 +15273,6 @@ fi if test "x$with_hsa_runtime_lib" != x; then HSA_RUNTIME_LIB=$with_hsa_runtime_lib fi -if test "x$HSA_RUNTIME_INCLUDE" != x; then - HSA_RUNTIME_CPPFLAGS=-I$HSA_RUNTIME_INCLUDE -fi -if test "x$HSA_RUNTIME_LIB" != x; then - HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB -fi PLUGIN_GCN=0 PLUGIN_GCN_CPPFLAGS= @@ -15390,8 +15382,6 @@ rm -f core conftest.err conftest.$ac_objext \ *) tgt_plugin=gcn PLUGIN_GCN=$tgt - PLUGIN_GCN_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS - PLUGIN_GCN_LDFLAGS="$HSA_RUNTIME_LDFLAGS" PLUGIN_GCN_LIBS="-ldl" PLUGIN_GCN=1 ;; diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac index da573bd8387..56461b89117 100644 --- a/libgomp/plugin/configfrag.ac +++ b/libgomp/plugin/configfrag.ac @@ -97,8 +97,6 @@ HSA_RUNTIME_INCLUDE= HSA_RUNTIME_LIB= AC_SUBST(HSA_RUNTIME_INCLUDE) AC_SUBST(HSA_RUNTIME_LIB) -HSA_RUNTIME_CPPFLAGS= -HSA_RUNTIME_LDFLAGS= AC_ARG_WITH(hsa-runtime, [AS_HELP_STRING([--with-hsa-runtime=PATH], @@ -121,12 +119,6 @@ fi if test "x$with_hsa_runtime_lib" != x; then HSA_RUNTIME_LIB=$with_hsa_runtime_lib fi -if test "x$HSA_RUNTIME_INCLUDE" != x; then - HSA_RUNTIME_CPPFLAGS=-I$HSA_RUNTIME_INCLUDE -fi -if test "x$HSA_RUNTIME_LIB" != x; then - HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB -fi PLUGIN_GCN=0 PLUGIN_GCN_CPPFLAGS= @@ -225,8 +217,6 @@ if test x"$enable_offload_targets" != x; then *) tgt_plugin=gcn PLUGIN_GCN=$tgt - PLUGIN_GCN_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS - PLUGIN_GCN_LDFLAGS="$HSA_RUNTIME_LDFLAGS" PLUGIN_GCN_LIBS="-ldl" PLUGIN_GCN=1 ;; -- 2.25.1