From patchwork Tue Jul 4 10:23:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 783857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3x20Tg4xYDz9s65 for ; Tue, 4 Jul 2017 20:23:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Zj8hiOJd"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=XP5ipsqm64WEwvHa/ xOhJyAEoI4uRHcvf8wYYlKiV4glOlrEcp7ssBefjot3hfK2vlPG3fcieUGkwHGFw T3LeBK/Vz9QEfEVMjDEkG6KPvICNiilKNg8Cm+0T/NkAMqBs/AV5+LnlFRaQfD+S 7ZNu6Tp4vR0Q3NT5w+jQ5X0TSk= 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 :subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=jrqt6ao/w47STqPUQYUa4rD K+gU=; b=Zj8hiOJdhC9jKju3J9shnJc/nHKt0/rrTsJVCAsYUrgjQ4b2NY4rD5d wYjQjZ09U/a+hdMMKuDl12K4JUCzi4edxzHIDNKsxtLpjxjqhpaMVU9C2MxKCarU XAs64MJ6T+G/tKv1nWbBoxY03mpLg8CwPH9jMDApM5D/4CThSMZ8= Received: (qmail 102453 invoked by alias); 4 Jul 2017 10:23:41 -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 102424 invoked by uid 89); 4 Jul 2017 10:23:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Jul 2017 10:23:37 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1dSKzX-0003ic-QQ from Tom_deVries@mentor.com ; Tue, 04 Jul 2017 03:23:35 -0700 Received: from [127.0.0.1] (137.202.0.87) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 4 Jul 2017 11:23:30 +0100 Subject: [PATCH, 3/3] Handle GOMP_NVPTX_JIT={-O[0-4], -ori, -arch=} in libgomp nvptx plugin From: Tom de Vries To: Thomas Schwinge , Jakub Jelinek CC: GCC Patches , Joseph Myers References: <2413b0f6-9cb2-243f-d805-08323a9c9a0a@mentor.com> <1de94c83-96da-f380-9964-1472f63270c9@mentor.com> <20170626152911.GK2123@tucnak> <87ziclsjed.fsf@hertz.schwinge.homeip.net> <80acb38b-1828-7d1b-e7fc-2a87cc0ad0ae@mentor.com> <809397ef-5508-5d7e-d4eb-f03213c5e690@mentor.com> Message-ID: <5e41dd53-5217-cbcc-ca3d-f30dc153c18d@mentor.com> Date: Tue, 4 Jul 2017 12:23:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <809397ef-5508-5d7e-d4eb-f03213c5e690@mentor.com> X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) On 07/04/2017 12:05 PM, Tom de Vries wrote: > On 07/03/2017 04:24 PM, Tom de Vries wrote: >> On 07/03/2017 04:08 PM, Thomas Schwinge wrote: >>> Hi! >>> >>> On Mon, 26 Jun 2017 17:29:11 +0200, Jakub Jelinek >>> wrote: >>>> On Mon, Jun 26, 2017 at 03:26:57PM +0000, Joseph Myers wrote: >>>>> On Mon, 26 Jun 2017, Tom de Vries wrote: >>>>> >>>>>>> 2. Handle GOMP_OPENACC_NVPTX_{DISASM,SAVE_TEMPS} in libgomp nvptx >>>>>>> plugin >>>>>> >>>>>> This patch adds handling of: >>>>>> - GOMP_OPENACC_NVPTX_SAVE_TEMPS=[01], and >>>>>> - GOMP_OPENACC_NVPTX_DISASM=[01] >>> >>> Why the "OPENACC" in these names? >> >> I took the format from 'GOMP_OPENACC_DIM'. >> >>> Doesn't this debugging aid apply to >>> any variant of offloading? >> >> I guess you're right. These environment variables would also be >> applicable for f.i. offloading via openmp on nvptx. I'll strip the >> 'OPENACC_' bit from the variables. >> >>>>>> The filename used for dumping the module is plugin-nvptx..cubin. >>> >>> Also, I suggest to make these names similar to their controlling >>> options, >>> that is: "gomp-nvptx*", for example. >>> >> >> Makes sense, will do. > > Changes in the patch series: > - removed OPENACC_ from environment variable names > - made temp files use gomp-nvptx prefix. > - fixed build error due to missing _GNU_SOURCE in libgomp-nvptx.c. > - merged the three GOMP_NVPTX_JIT patches into one > - rewrote GOMP_NVPTX_JIT to add no extra flags to the JIT compiler > invocation if GOMP_NVPTX_JIT if not defined, removing the need for > hardcoding default values > - added CU_JIT_TARGET to plugin/cuda/cuda.h > > Build on x86_64 with nvptx offloading enabled (using plugin/cuda/cuda.h). > > The patch series now looks like: > 1. Handle GOMP_NVPTX_{DISASM,SAVE_TEMPS} in libgomp nvptx plugin > 2. Handle GOMP_NVPTX_PTXRW in libgomp nvptx plugin > 3. Handle GOMP_NVPTX_JIT={-O[0-4],-ori,-arch=} in libgomp nvptx > plugin > > I'll repost the patch series in reply to this email. > 3. Handle GOMP_NVPTX_JIT={-O[0-4],-ori,-arch=} in libgomp nvptx plugin ( combination of 3 GOMP_NVPTX_JIT patches originally submitted at: https://gcc.gnu.org/ml/gcc-patches/2017-06/msg01921.html https://gcc.gnu.org/ml/gcc-patches/2017-06/msg01920.html https://gcc.gnu.org/ml/gcc-patches/2017-06/msg02407.html ) Thanks, - Tom Handle GOMP_NVPTX_JIT={-O[0-4],-ori,-arch=} in libgomp nvptx plugin 2017-06-26 Tom de Vries * plugin/cuda/cuda.h (enum CUjit_option): Add CU_JIT_OPTIMIZATION_LEVEL, CU_JIT_NEW_SM3X_OPT and CU_JIT_TARGET. * plugin/plugin-nvptx.c (parse_number): New function. (process_GOMP_NVPTX_JIT): New function. (link_ptx): Add CU_JIT_OPTIMIZATION_LEVEL, CU_JIT_NEW_SM3X_OPT and CU_JIT_TARGET to opts if specified. --- libgomp/plugin/cuda/cuda.h | 5 +- libgomp/plugin/plugin-nvptx.c | 108 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 109 insertions(+), 4 deletions(-) diff --git a/libgomp/plugin/cuda/cuda.h b/libgomp/plugin/cuda/cuda.h index 25d5d19..7d190f1 100644 --- a/libgomp/plugin/cuda/cuda.h +++ b/libgomp/plugin/cuda/cuda.h @@ -88,7 +88,10 @@ typedef enum { CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES = 4, CU_JIT_ERROR_LOG_BUFFER = 5, CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES = 6, - CU_JIT_LOG_VERBOSE = 12 + CU_JIT_OPTIMIZATION_LEVEL = 7, + CU_JIT_TARGET = 9, + CU_JIT_LOG_VERBOSE = 12, + CU_JIT_NEW_SM3X_OPT = 15 } CUjit_option; typedef enum { diff --git a/libgomp/plugin/plugin-nvptx.c b/libgomp/plugin/plugin-nvptx.c index cc2ee5e..f5b9502 100644 --- a/libgomp/plugin/plugin-nvptx.c +++ b/libgomp/plugin/plugin-nvptx.c @@ -144,6 +144,10 @@ init_cuda_lib (void) #include "secure_getenv.h" +#if CUDA_VERSION < 8000 +#define CU_JIT_NEW_SM3X_OPT 15 +#endif + /* Convenience macros for the frequently used CUDA library call and error handling sequence as well as CUDA library calls that do the error checking themselves or don't do it at all. */ @@ -1106,11 +1110,77 @@ post_process_ptx (unsigned num, const char **res_code, size_t *res_size) } static bool +parse_number (const char *c, unsigned long* resp, char **end) +{ + unsigned long res; + + errno = 0; + res = strtoul (c, end, 10); + if (errno) + return false; + + *resp = res; + return true; +} + +static void +process_GOMP_NVPTX_JIT (intptr_t *gomp_nvptx_o, intptr_t *gomp_nvptx_ori, + uintptr_t *gomp_nvptx_target) +{ + const char *var_name = "GOMP_NVPTX_JIT"; + const char *env_var = getenv (var_name); + notify_var (var_name, env_var); + + if (env_var == NULL) + return; + + const char *c = env_var; + while (*c != '\0') + { + while (*c == ' ') + c++; + + if (c[0] == '-' && c[1] == 'O' + && '0' <= c[2] && c[2] <= '4' + && (c[3] == '\0' || c[3] == ' ')) + { + *gomp_nvptx_o = c[2] - '0'; + c += 3; + continue; + } + + if (c[0] == '-' && c[1] == 'o' && c[2] == 'r' && c[3] == 'i' + && (c[4] == '\0' || c[4] == ' ')) + { + *gomp_nvptx_ori = 1; + c += 4; + continue; + } + + if (c[0] == '-' && c[1] == 'a' && c[2] == 'r' && c[3] == 'c' + && c[4] == 'h' && c[5] == '=') + { + const char *end; + unsigned long val; + if (parse_number (&c[6], &val, (char**)&end)) + { + *gomp_nvptx_target = val; + c = end; + continue; + } + } + + GOMP_PLUGIN_error ("Error parsing %s", var_name); + break; + } +} + +static bool link_ptx (CUmodule *module, const struct targ_ptx_obj *ptx_objs, unsigned num_objs) { - CUjit_option opts[6]; - void *optvals[6]; + CUjit_option opts[9]; + void *optvals[9]; float elapsed = 0.0; char elog[1024]; char ilog[16384]; @@ -1137,7 +1207,39 @@ link_ptx (CUmodule *module, const struct targ_ptx_obj *ptx_objs, opts[5] = CU_JIT_LOG_VERBOSE; optvals[5] = (void *) 1; - CUDA_CALL (cuLinkCreate, 6, opts, optvals, &linkstate); + static intptr_t gomp_nvptx_o = -1; + static intptr_t gomp_nvptx_ori = -1; + static uintptr_t gomp_nvptx_target = 0; + + static bool init_done = false; + if (!init_done) + { + process_GOMP_NVPTX_JIT (&gomp_nvptx_o, &gomp_nvptx_ori, + &gomp_nvptx_target); + init_done = true; + } + + int nopts = 6; + if (gomp_nvptx_o != -1) + { + opts[nopts] = CU_JIT_OPTIMIZATION_LEVEL; + optvals[nopts] = (void *) gomp_nvptx_o; + nopts++; + } + if (gomp_nvptx_ori != -1) + { + opts[nopts] = CU_JIT_NEW_SM3X_OPT; + optvals[nopts] = (void *) gomp_nvptx_ori; + nopts++; + } + if (gomp_nvptx_target != 0) + { + opts[nopts] = CU_JIT_TARGET; + optvals[nopts] = (void *) gomp_nvptx_target; + nopts++; + } + + CUDA_CALL (cuLinkCreate, nopts, opts, optvals, &linkstate); for (; num_objs--; ptx_objs++) {