From 14e5e74698b98f4cbe398cb989dfa27765cbca6e Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Wed, 22 Jan 2020 17:56:54 +0000 Subject: [PATCH] Fix libgomp plugin-gcn bug 2020-01-23 Andrew Stubbs libgomp/ * plugin/plugin-gcn.c (parse_target_attributes): Use correct mask for the device id. --- libgomp/ChangeLog | 5 +++++ libgomp/plugin/plugin-gcn.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index fa6aeed4ec4..c0dde5cec3c 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2020-01-23 Andrew Stubbs + + * plugin/plugin-gcn.c (parse_target_attributes): Use correct mask for + the device id. + 2020-01-20 Andrew Stubbs * testsuite/libgomp.oacc-c-c++-common/loop-auto-1.c: Skip test on gcn. diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index de470a3dd33..7854c142f05 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -1228,7 +1228,8 @@ parse_target_attributes (void **input, grid_attrs_found = true; break; } - else if ((id & GOMP_TARGET_ARG_DEVICE_ALL) == GOMP_TARGET_ARG_DEVICE_ALL) + else if ((id & GOMP_TARGET_ARG_DEVICE_MASK) + == GOMP_TARGET_ARG_DEVICE_ALL) { gcn_dims_found = true; switch (id & GOMP_TARGET_ARG_ID_MASK) -- 2.30.2