offload data version number

Hi!

On Sat, 1 Aug 2015 20:20:49 -0400, Nathan Sidwell <nathan@acm.org> wrote:
> this is the gomp4 committed version.

> --- liboffloadmic/plugin/libgomp-plugin-intelmic.cpp	(revision 226462)
> +++ liboffloadmic/plugin/libgomp-plugin-intelmic.cpp	(working copy)
> @@ -327,12 +327,26 @@ offload_image (const void *target_image)
>    free (image);
>  }
>  
> +/* Return the libgomp version number we're compatible with.  There is
> +   no requirement for cross-version compatibility.  */
> +
> +extern "C" unsigned
> +GOMP_OFFLOAD_version (void)
> +{
> +  return GOMP_VERSION;
> +}
> +
>  extern "C" int
> -GOMP_OFFLOAD_load_image (int device, const void *target_image,
> -			 addr_pair **result)
> +GOMP_OFFLOAD_load_image (int device, const unsigned version,
> +			 void *target_image, addr_pair **result)
>  {
>    TRACE ("(device = %d, target_image = %p)", device, target_image);
>  
> +  if (GOMP_VERSION_DEV (version) > GOMP_VERSION_INTEL_MIC)
> +    GOMP_PLUGIN_fatal ("Offload data incompatible with intelmic plugin"
> +		       " (expected %u, received %u)",
> +		       GOMP_VERSION_INTEL_MIC, GOMP_VERSION_DEV (version));
> +
>    /* If target_image is already present in address_table, then there is no need
>       to offload it.  */
>    if (address_table->count (target_image) == 0)
> @@ -353,8 +367,12 @@ GOMP_OFFLOAD_load_image (int device, con
>  }
>  
>  extern "C" void
> -GOMP_OFFLOAD_unload_image (int device, const void *target_image)
> +GOMP_OFFLOAD_unload_image (int device, unsigned version,
> +			   const void *target_image)
>  {
> +  if (GOMP_VERSION_DEV (version) > GOMP_VERSION_INTEL_MIC)
> +    return;
> +
>    TRACE ("(device = %d, target_image = %p)", device, target_image);
>  
>    /* TODO: Currently liboffloadmic doesn't support __offload_unregister_image

Committed to gomp-4_0-branch in r226497:

commit 4e0158f41a00d6c4d09ca8a48eb63832abdd2f84
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Mon Aug 3 11:14:24 2015 +0000

    Fix intelmic libgomp plugin build
    
    ... which got broken in r226469:
    
        [...]/source-gcc/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp: In function 'unsigned int GOMP_OFFLOAD_version()':
        [...]/source-gcc/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp:336:10: error: 'GOMP_VERSION' was not declared in this scope
           return GOMP_VERSION;
                  ^
        [...]/source-gcc/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp: In function 'int GOMP_OFFLOAD_load_image(int, unsigned int, void*, addr_pair**)':
        [...]/source-gcc/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp:345:32: error: 'GOMP_VERSION_DEV' was not declared in this scope
           if (GOMP_VERSION_DEV (version) > GOMP_VERSION_INTEL_MIC)
                                        ^
        [...]/source-gcc/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp:345:36: error: 'GOMP_VERSION_INTEL_MIC' was not declared in this scope
           if (GOMP_VERSION_DEV (version) > GOMP_VERSION_INTEL_MIC)
                                            ^
        [...]/source-gcc/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp: In function 'void GOMP_OFFLOAD_unload_image(int, unsigned int, const void*)':
        [...]/source-gcc/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp:373:32: error: 'GOMP_VERSION_DEV' was not declared in this scope
           if (GOMP_VERSION_DEV (version) > GOMP_VERSION_INTEL_MIC)
                                        ^
        [...]/source-gcc/liboffloadmic/plugin/libgomp-plugin-intelmic.cpp:373:36: error: 'GOMP_VERSION_INTEL_MIC' was not declared in this scope
           if (GOMP_VERSION_DEV (version) > GOMP_VERSION_INTEL_MIC)
                                            ^
        make[6]: *** [libgomp_plugin_intelmic_la-libgomp-plugin-intelmic.lo] Error 1
    
    	liboffloadmic/
    	* plugin/Makefile.am (include_src_dir): Set.
    	[PLUGIN_HOST] (libgomp_plugin_intelmic_la_CPPFLAGS): Use it.
    	* plugin/Makefile.in: Regenerate.
    	* plugin/libgomp-plugin-intelmic.cpp: Include "gomp-constants.h".
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@226497 138bc75d-0d04-0410-961f-82ee72b054a4
---
 liboffloadmic/ChangeLog.gomp                     |    7 +++++++
 liboffloadmic/plugin/Makefile.am                 |    3 ++-
 liboffloadmic/plugin/Makefile.in                 |    3 ++-
 liboffloadmic/plugin/libgomp-plugin-intelmic.cpp |    3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)



Grüße,
 Thomas

On 08/03/15 07:15, Thomas Schwinge wrote:
> Hi!
>
> On Sat, 1 Aug 2015 20:20:49 -0400, Nathan Sidwell <nathan@acm.org> wrote:
>> this is the gomp4 committed version.
>
>> --- liboffloadmic/plugin/libgomp-plugin-intelmic.cpp	(revision 226462)
>> +++ liboffloadmic/plugin/libgomp-plugin-intelmic.cpp	(working copy)
>> @@ -327,12 +327,26 @@ offload_image (const void *target_image)
>>     free (image);

Please prepare a patch that can be applied to trunk.  We'll need that for the 
trunk version of the version patch I posted for review.  Are you able to check 
that patch builds for intelmic?

nathan