From patchwork Wed Apr 3 11:53:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 87969 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 3AAE73846420 for ; Wed, 3 Apr 2024 11:54:12 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 4B0663847718 for ; Wed, 3 Apr 2024 11:53:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4B0663847718 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 4B0663847718 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712145219; cv=none; b=OUr7o4nbwQh/tYHpKX+ItoNTBcBOIvlXmFpN4Y/DqST0z7Q9Ndv81PHfqIQFJejS+Fmzgfe6CggzUGhEkkGV2KpZ+vz8hqgo4Ldix52iV63yKlsVKSdWZ+JEYjaRqEJU/BoXb7C8BS14//SOGmo9VDiAVpXHc67tqT/PkXdlmlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712145219; c=relaxed/simple; bh=WA3xM/lhyxehJfp4veymIOaalipN1dij2rtOyAo8ELY=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=cTTeBhpSiQv7awdgavnvsscdhaDGjvnKjEfzA5zpDv8gNbpq0Kq0kHkUeTs6GCgwSHkFhJfUC35NkLTWAdBjg1AF3bc/pX8n9LRHnOg1P7ZIbCr14whkZFjyDWwlEWA8rG0WBs6PaNdURhmJjvgnYeCF0kd+1FzrFW/wQkiI/lY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-34378a6994cso903265f8f.1 for ; Wed, 03 Apr 2024 04:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1712145215; x=1712750015; darn=gcc.gnu.org; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=QBaAyCV8ISL8EFYZhfkhDZjS8PwEmvAE3/oVFjPEZlc=; b=a/NUIsjMLwCIc2/cDMiJFnCTlxqGrMZBryTnu6XsLRYgrU9GRmqQq/K7PxcDcAlDoQ VypljbpM0/lNeCyzM4mtlYBvD5SZkCQiKjqHqpJwAXM8Wpligj02SoH3vLesMaAkH7Tt ASIOAtm9dgjI+i4x3P+X5D+ZJLUu36yr1K711DI55m34ryX0BkFjYmgrQawmnkS+SkVh dPwJsmDQg1OXSY7J9/8XY0NeSvitlxXDHjNeZdDuDpVCF2LsNknmRx6W7S8RUvQUumCj h8z/TW3JsXX2kMKshzSSyJA50qwz0F4+fG1xo+Gyg73M2uT3ppVH31Ljt/J43d/3RMmG s2ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712145215; x=1712750015; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QBaAyCV8ISL8EFYZhfkhDZjS8PwEmvAE3/oVFjPEZlc=; b=aZUttD7L3W+LVeg0YmfeZRwSPvzJKyXpbvwPl21Hh/TI8Dxv/xiS5TxOWHp0O00uzZ 42joOGd1vGom/87yVqMo6cwlj4xIk89Xi7SmWC2GLBxdakn/v+1ip3yFezRDURD3xoTS +XNIHB4tyPjkLdn5oyEgUle0uOSpujwY3nU5eNB+MxMgoA5yTLiP1JuvBKndVVoommAJ ohs1xWhJtoFIU1n4zJS+uifU5g5IgS5p43tNIshfnmaNKq4haoAxfxI4gIGHpoRlZYRk 671Jde9cYn96wyDs/2cy/yhnjj1uUU2UZQCQ2b8Q1Ce0cKC3u3yXZcX6wmq+GB9iwTIV Npkg== X-Gm-Message-State: AOJu0YxbcZgum5Prci8kG7IfhNIE3HIT+OaOmgv/ovYPG6nx7Getoy6E Im5J3kP8DQTuvvV7DoxfVWzd5B2a94a+kQCzznFaeCRZShP9aWIiyyKq0WhCGulbl40C24ChKmK j X-Google-Smtp-Source: AGHT+IGgif6TnKwnPXLFLY3kmJ/xJ+y0sjeiclKbblF2qeG/+NfODW+iy+gtdZFB2ES0icBdjYoeAg== X-Received: by 2002:a5d:4d4d:0:b0:343:9f91:82ba with SMTP id a13-20020a5d4d4d000000b003439f9182bamr667751wru.54.1712145214821; Wed, 03 Apr 2024 04:53:34 -0700 (PDT) Received: from ?IPV6:2001:16b8:2ad3:b600:23:e49d:37af:1a62? (200116b82ad3b6000023e49d37af1a62.dip.versatel-1u1.de. [2001:16b8:2ad3:b600:23:e49d:37af:1a62]) by smtp.gmail.com with ESMTPSA id bx12-20020a5d5b0c000000b0034354a99d43sm1620606wrb.43.2024.04.03.04.53.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 04:53:34 -0700 (PDT) Message-ID: <504cc686-24b0-4477-9aa5-4623333f33cd@baylibre.com> Date: Wed, 3 Apr 2024 13:53:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: gcc-patches , Richard Biener From: Tobias Burnus Subject: [Patch] lto-wrapper.cc: Add offload target name to 'offload_args' suffix X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, 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 Found when working with -save-temps and looking at 'mkoffload' with a GCC configured for both nvptx and gcn offloading. Before (for 'a.out') for mkoffload:a.offload_args now: a.amdgcn-amdhsa.offload_args and a.nvptx-none.offload_args OK for mainline? Tobias PS: The code does not free the 'xmalloc'ed memory, but that's also the case of all/most 'concat' in this file; the concat could also be skipped when no save_temps is used, in case this optimization makes sense. lto-wrapper.cc: Add offload target name to 'offload_args' suffix lto-wrapper.cc's compile_offload_image calls mkoffload with an @./a.offload_args argument ('a.' in case of, e.g., 'a.out'). However, when generating code for both nvptx and gcn, they use the same name with -save-temps. Hence, this commit adds a + '.' before 'offload_args' in line with other offload-target-specific files. gcc/ChangeLog: * lto-wrapper.cc (compile_offload_image): Prefix 'offload_args' suffix by the target name. diff --git a/gcc/lto-wrapper.cc b/gcc/lto-wrapper.cc index ca53e4b462e..610594cdc2b 100644 --- a/gcc/lto-wrapper.cc +++ b/gcc/lto-wrapper.cc @@ -993,7 +993,8 @@ compile_offload_image (const char *target, const char *compiler_path, obstack_ptr_grow (&argv_obstack, NULL); argv = XOBFINISH (&argv_obstack, char **); - fork_execute (argv[0], argv, true, "offload_args"); + suffix = concat (target, ".offload_args", NULL); + fork_execute (argv[0], argv, true, suffix); obstack_free (&argv_obstack, NULL); free_array_of_ptrs ((void **) paths, n_paths);