From: Hongyu Wang <wwwhhhyyy333@gmail.com>
To: Jakub Jelinek <jakub@redhat.com>
Cc: Hongyu Wang <hongyu.wang@intel.com>, gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] libgomp: Fix default value of GOMP_SPINCOUNT [PR 109062]
Date: Wed, 8 Mar 2023 16:54:20 +0800 [thread overview]
Message-ID: <CA+OydW=HZHAanKHU3uzBkzL8paJtcPO7coSQuU6Wqmi7-8GqJw@mail.gmail.com> (raw)
In-Reply-To: <ZAhI2G6icli9FYp4@tucnak>
> Seems for many ICVs the default values are done through
> gomp_default_icv_values, but that doesn't cover wait_policy.
> For other vars, the defaults are provided through just initializers of
> those vars on the var definitions, e.g.:
> char *gomp_affinity_format_var = "level %L thread %i affinity %A";
> So, I'd do the initialize_icvs change and change
> static int wait_policy;
> to
> static int wait_policy = -1;
Agreed, here is the updated patch, ok for trunk?
When OMP_WAIT_POLICY is not specified, current implementation will cause
icv flag GOMP_ICV_WAIT_POLICY unset, so global variable wait_policy
will remain its uninitialized value. Initialize it to -1 to make
GOMP_SPINCOUNT behavior consistent with its description.
libgomp/ChangeLog:
PR libgomp/109062
* env.c (wait_policy): Initialize to -1.
(initialize_icvs): Initialize icvs->wait_policy to -1.
* testsuite/libgomp.c-c++-common/pr109062.c: New test.
---
libgomp/env.c | 4 ++--
libgomp/testsuite/libgomp.c-c++-common/pr109062.c | 14 ++++++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 libgomp/testsuite/libgomp.c-c++-common/pr109062.c
diff --git a/libgomp/env.c b/libgomp/env.c
index c41c1f852cc..e7a035b593c 100644
--- a/libgomp/env.c
+++ b/libgomp/env.c
@@ -124,7 +124,7 @@ int goacc_default_dims[GOMP_DIM_MAX];
#ifndef LIBGOMP_OFFLOADED_ONLY
-static int wait_policy;
+static int wait_policy = -1;
static unsigned long stacksize = GOMP_DEFAULT_STACKSIZE;
static void
@@ -1981,7 +1981,7 @@ initialize_icvs (struct gomp_initial_icvs *icvs)
icvs->bind_var = gomp_default_icv_values.bind_var;
icvs->nteams_var = gomp_default_icv_values.nteams_var;
icvs->teams_thread_limit_var =
gomp_default_icv_values.teams_thread_limit_var;
- icvs->wait_policy = 0;
+ icvs->wait_policy = -1;
}
/* Helper function for initialize_env to add a device specific ICV value
diff --git a/libgomp/testsuite/libgomp.c-c++-common/pr109062.c
b/libgomp/testsuite/libgomp.c-c++-common/pr109062.c
new file mode 100644
index 00000000000..5c7c287dafd
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c-c++-common/pr109062.c
@@ -0,0 +1,14 @@
+/* { dg-do run } */
+
+#include <omp.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+ omp_display_env (1);
+
+ return 0;
+}
+
+/* { dg-output ".*\\\[host] GOMP_SPINCOUNT = '300000'.*" { target native } } */
--
2.31.1
next prev parent reply other threads:[~2023-03-08 9:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 6:31 Hongyu Wang
2023-03-08 7:35 ` Jakub Jelinek
2023-03-08 8:07 ` Hongyu Wang
2023-03-08 8:21 ` Hongyu Wang
2023-03-08 8:35 ` Jakub Jelinek
2023-03-08 8:54 ` Hongyu Wang [this message]
2023-03-08 9:03 ` Jakub Jelinek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+OydW=HZHAanKHU3uzBkzL8paJtcPO7coSQuU6Wqmi7-8GqJw@mail.gmail.com' \
--to=wwwhhhyyy333@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=hongyu.wang@intel.com \
--cc=jakub@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).