Re: [Mesa-dev] [PATCH] clover/llvm: Fix build against LLVM/Clang 4.0

2018-03-21 Thread Francisco Jerez 
Aaron Watry  writes:

> The opencl 1.0 langstandard was renamed in 5.0+
>
> v2: Move preprocessor check into compat.hpp
>
> Cc: Mark Janes 
> Cc: Francisco Jerez 

Reviewed-by: Francisco Jerez 

> ---
>  src/gallium/state_trackers/clover/llvm/compat.hpp | 2 ++
>  src/gallium/state_trackers/clover/llvm/invocation.cpp | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp 
> b/src/gallium/state_trackers/clover/llvm/compat.hpp
> index 19528a0133..2e070b2eef 100644
> --- a/src/gallium/state_trackers/clover/llvm/compat.hpp
> +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
> @@ -89,8 +89,10 @@ namespace clover {
>  
>  #if HAVE_LLVM >= 0x0500
>   const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
> + const clang::LangStandard::Kind lang_opencl10 = 
> clang::LangStandard::lang_opencl10;
>  #else
>   const clang::InputKind ik_opencl = clang::IK_OpenCL;
> + const clang::LangStandard::Kind lang_opencl10 = 
> clang::LangStandard::lang_opencl;
>  #endif
>  
>   inline void
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp 
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index af78c2ae28..b2c64bc48f 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -85,7 +85,7 @@ namespace {
>  };
>  
>  const clc_version_lang_std cl_version_lang_stds[] = {
> -   { 100, clang::LangStandard::lang_opencl10},
> +   { 100, compat::lang_opencl10},
> { 110, clang::LangStandard::lang_opencl11},
> { 120, clang::LangStandard::lang_opencl12},
> { 200, clang::LangStandard::lang_opencl20},
> -- 
> 2.14.1


signature.asc
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] clover/llvm: Fix build against LLVM/Clang 4.0

2018-03-21 Thread Aaron Watry 
The opencl 1.0 langstandard was renamed in 5.0+

v2: Move preprocessor check into compat.hpp

Cc: Mark Janes 
Cc: Francisco Jerez 
---
 src/gallium/state_trackers/clover/llvm/compat.hpp | 2 ++
 src/gallium/state_trackers/clover/llvm/invocation.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp 
b/src/gallium/state_trackers/clover/llvm/compat.hpp
index 19528a0133..2e070b2eef 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -89,8 +89,10 @@ namespace clover {
 
 #if HAVE_LLVM >= 0x0500
  const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
+ const clang::LangStandard::Kind lang_opencl10 = 
clang::LangStandard::lang_opencl10;
 #else
  const clang::InputKind ik_opencl = clang::IK_OpenCL;
+ const clang::LangStandard::Kind lang_opencl10 = 
clang::LangStandard::lang_opencl;
 #endif
 
  inline void
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp 
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index af78c2ae28..b2c64bc48f 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -85,7 +85,7 @@ namespace {
 };
 
 const clc_version_lang_std cl_version_lang_stds[] = {
-   { 100, clang::LangStandard::lang_opencl10},
+   { 100, compat::lang_opencl10},
{ 110, clang::LangStandard::lang_opencl11},
{ 120, clang::LangStandard::lang_opencl12},
{ 200, clang::LangStandard::lang_opencl20},
-- 
2.14.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] clover/llvm: Fix build against LLVM/Clang 4.0

2018-03-21 Thread Francisco Jerez 
Aaron Watry  writes:

> On Wed, Mar 21, 2018, 4:49 PM Francisco Jerez  wrote:
>
>> Aaron Watry  writes:
>>
>> > The opencl 1.0 langstandard was renamed in 5.0+
>> >
>> > Cc: Mark Janes 
>> > ---
>> >  src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 
>> >  1 file changed, 4 insertions(+)
>> >
>> > diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
>> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
>> > index af78c2ae28..2fb3ce2365 100644
>> > --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
>> > +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
>> > @@ -85,7 +85,11 @@ namespace {
>> >  };
>> >
>> >  const clc_version_lang_std cl_version_lang_stds[] = {
>> > +#if HAVE_LLVM >= 0x0500
>> > { 100, clang::LangStandard::lang_opencl10},
>> > +#else
>> > +   { 100, clang::LangStandard::lang_opencl},
>> > +#endif
>>
>> Please move this preprocessor magic into an llvm/compat.hpp definition.
>> Thanks!
>>
>
> Sure thing.  Do you want to see a v2?
>

I wouldn't mind.

> --Aaron
>
>
>> > { 110, clang::LangStandard::lang_opencl11},
>> > { 120, clang::LangStandard::lang_opencl12},
>> > { 200, clang::LangStandard::lang_opencl20},
>> > --
>> > 2.14.1
>> >
>> > ___
>> > mesa-dev mailing list
>> > mesa-dev@lists.freedesktop.org
>> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>


signature.asc
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] clover/llvm: Fix build against LLVM/Clang 4.0

2018-03-21 Thread Aaron Watry 
On Wed, Mar 21, 2018, 4:49 PM Francisco Jerez  wrote:

> Aaron Watry  writes:
>
> > The opencl 1.0 langstandard was renamed in 5.0+
> >
> > Cc: Mark Janes 
> > ---
> >  src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> > index af78c2ae28..2fb3ce2365 100644
> > --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> > +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> > @@ -85,7 +85,11 @@ namespace {
> >  };
> >
> >  const clc_version_lang_std cl_version_lang_stds[] = {
> > +#if HAVE_LLVM >= 0x0500
> > { 100, clang::LangStandard::lang_opencl10},
> > +#else
> > +   { 100, clang::LangStandard::lang_opencl},
> > +#endif
>
> Please move this preprocessor magic into an llvm/compat.hpp definition.
> Thanks!
>

Sure thing.  Do you want to see a v2?

--Aaron


> > { 110, clang::LangStandard::lang_opencl11},
> > { 120, clang::LangStandard::lang_opencl12},
> > { 200, clang::LangStandard::lang_opencl20},
> > --
> > 2.14.1
> >
> > ___
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] clover/llvm: Fix build against LLVM/Clang 4.0

2018-03-21 Thread Francisco Jerez 
Aaron Watry  writes:

> The opencl 1.0 langstandard was renamed in 5.0+
>
> Cc: Mark Janes 
> ---
>  src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 
>  1 file changed, 4 insertions(+)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp 
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index af78c2ae28..2fb3ce2365 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -85,7 +85,11 @@ namespace {
>  };
>  
>  const clc_version_lang_std cl_version_lang_stds[] = {
> +#if HAVE_LLVM >= 0x0500
> { 100, clang::LangStandard::lang_opencl10},
> +#else
> +   { 100, clang::LangStandard::lang_opencl},
> +#endif

Please move this preprocessor magic into an llvm/compat.hpp definition.
Thanks!

> { 110, clang::LangStandard::lang_opencl11},
> { 120, clang::LangStandard::lang_opencl12},
> { 200, clang::LangStandard::lang_opencl20},
> -- 
> 2.14.1
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


signature.asc
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] clover/llvm: Fix build against LLVM/Clang 4.0

2018-03-21 Thread Mark Janes 
This patch fixes the clover build for Clang 4.0, which is what the Intel
CI uses.

Tested-by: Mark Janes 

Aaron Watry  writes:

> The opencl 1.0 langstandard was renamed in 5.0+
>
> Cc: Mark Janes 
> ---
>  src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 
>  1 file changed, 4 insertions(+)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp 
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index af78c2ae28..2fb3ce2365 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -85,7 +85,11 @@ namespace {
>  };
>  
>  const clc_version_lang_std cl_version_lang_stds[] = {
> +#if HAVE_LLVM >= 0x0500
> { 100, clang::LangStandard::lang_opencl10},
> +#else
> +   { 100, clang::LangStandard::lang_opencl},
> +#endif
> { 110, clang::LangStandard::lang_opencl11},
> { 120, clang::LangStandard::lang_opencl12},
> { 200, clang::LangStandard::lang_opencl20},
> -- 
> 2.14.1
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] clover/llvm: Fix build against LLVM/Clang 4.0

2018-03-21 Thread Aaron Watry 
The opencl 1.0 langstandard was renamed in 5.0+

Cc: Mark Janes 
---
 src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp 
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index af78c2ae28..2fb3ce2365 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -85,7 +85,11 @@ namespace {
 };
 
 const clc_version_lang_std cl_version_lang_stds[] = {
+#if HAVE_LLVM >= 0x0500
{ 100, clang::LangStandard::lang_opencl10},
+#else
+   { 100, clang::LangStandard::lang_opencl},
+#endif
{ 110, clang::LangStandard::lang_opencl11},
{ 120, clang::LangStandard::lang_opencl12},
{ 200, clang::LangStandard::lang_opencl20},
-- 
2.14.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev