OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve Intel MIC offloading XFAILing for 'omp_get_device_num' 

After recent commit be661959a6
"libgomp/testsuite: Improve omp_get_device_num() tests", we're now iterating
over all OpenMP target devices.  Intel MIC (emulated) offloading still doesn't
properly implement device-side 'omp_get_device_num', and we thus regress:

    PASS: libgomp.c/../libgomp.c-c++-common/target-45.c (test for excess errors)
    [-PASS:-]{+FAIL:+} libgomp.c/../libgomp.c-c++-common/target-45.c execution test

    PASS: libgomp.c++/../libgomp.c-c++-common/target-45.c (test for excess errors)
    [-PASS:-]{+FAIL:+} libgomp.c++/../libgomp.c-c++-common/target-45.c execution test

    PASS: libgomp.fortran/target10.f90   -O0  (test for excess errors)
    [-PASS:-]{+FAIL:+} libgomp.fortran/target10.f90   -O0  execution test
    PASS: libgomp.fortran/target10.f90   -O1  (test for excess errors)
    [-PASS:-]{+FAIL:+} libgomp.fortran/target10.f90   -O1  execution test
    PASS: libgomp.fortran/target10.f90   -O2  (test for excess errors)
    [-PASS:-]{+FAIL:+} libgomp.fortran/target10.f90   -O2  execution test
    PASS: libgomp.fortran/target10.f90   -O3 -fomit-frame-pointer -funroll-loops -fpeel-loops -ftracer -finline-functions  (test for excess errors)
    [-PASS:-]{+FAIL:+} libgomp.fortran/target10.f90   -O3 -fomit-frame-pointer -funroll-loops -fpeel-loops -ftracer -finline-functions  execution test
    PASS: libgomp.fortran/target10.f90   -O3 -g  (test for excess errors)
    [-PASS:-]{+FAIL:+} libgomp.fortran/target10.f90   -O3 -g  execution test
    PASS: libgomp.fortran/target10.f90   -Os  (test for excess errors)
    [-PASS:-]{+FAIL:+} libgomp.fortran/target10.f90   -Os  execution test

Improve the XFAILing added in commit bb75b22aba
"Allow matching Intel MIC in OpenMP 'declare variant'" for the case that *any*
Intel MIC offload device is available.

	libgomp/
	* testsuite/libgomp.c-c++-common/on_device_arch.h
	(any_device_arch, any_device_arch_intel_mic): New.
	* testsuite/lib/libgomp.exp
	(check_effective_target_offload_device_any_intel_mic): New.
	* testsuite/libgomp.c-c++-common/target-45.c: Use it.
	* testsuite/libgomp.fortran/target10.f90: Likewise.
This commit is contained in:
Thomas Schwinge 2022-01-05 19:52:25 +01:00
parent 67fdcc8835
commit d97364aab1
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libgomp/testsuite/lib/libgomp.exp
View File

@ -451,7 +451,6 @@ proc check_effective_target_openacc_nvidia_accel_selected { } {
# Return 1 if using Intel MIC offload device.
proc check_effective_target_offload_device_intel_mic { } {
return [check_runtime_nocache offload_device_intel_mic {
#include <omp.h>
#include "testsuite/libgomp.c-c++-common/on_device_arch.h"
int main ()
{
@ -460,6 +459,17 @@ proc check_effective_target_offload_device_intel_mic { } {
} ]
}
# Return 1 if any Intel MIC offload device is available.
proc check_effective_target_offload_device_any_intel_mic { } {
return [check_runtime_nocache offload_device_any_intel_mic {
#include "testsuite/libgomp.c-c++-common/on_device_arch.h"
int main ()
{
return !any_device_arch_intel_mic ();
}
} ]
}
# Return 1 if the OpenACC 'host' device type is selected.
proc check_effective_target_openacc_host_selected { } {

23
libgomp/testsuite/libgomp.c-c++-common/on_device_arch.h
View File

@ -1,3 +1,4 @@
#include <omp.h>
#include <gomp-constants.h>
/* static */ int
@ -41,3 +42,25 @@ on_device_arch_intel_mic ()
{
return on_device_arch (GOMP_DEVICE_INTEL_MIC);
}
static int
any_device_arch (int d)
{
int nd = omp_get_num_devices ();
for (int i = 0; i < nd; ++i)
{
int d_cur;
#pragma omp target device(i) map(from:d_cur)
d_cur = device_arch ();
if (d_cur == d)
return 1;
}
return 0;
}
int
any_device_arch_intel_mic ()
{
return any_device_arch (GOMP_DEVICE_INTEL_MIC);
}

2
libgomp/testsuite/libgomp.c-c++-common/target-45.c
View File

@ -1,4 +1,4 @@
/* { dg-xfail-run-if TODO { offload_device_intel_mic } } */
/* { dg-xfail-run-if TODO { offload_device_any_intel_mic } } */
#include <omp.h>
#include <stdlib.h>

2
libgomp/testsuite/libgomp.fortran/target10.f90
View File

@ -1,5 +1,5 @@
! { dg-do run }
! { dg-xfail-run-if TODO { offload_device_intel_mic } }
! { dg-xfail-run-if TODO { offload_device_any_intel_mic } }
program main
use omp_lib