Re: [Mesa-dev] [PATCH] clover: fix build with LLVM 3.4
On Fri, Nov 01, 2013 at 10:25:43AM -0500, Aaron Watry wrote:
> dso_list was added as an argument for createInternalizePass in 3.4, and then
> it was removed again in the same llvm version.
I've pushed this patch, thanks!
-Tom
> ---
> src/gallium/state_trackers/clover/llvm/invocation.cpp | 5 -
> 1 file changed, 5 deletions(-)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index 4ae496f..3f50317 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -267,12 +267,7 @@ namespace {
> llvm::Function *kernel = *I;
> export_list.push_back(kernel->getName().data());
>}
> -#if HAVE_LLVM < 0x0304
>PM.add(llvm::createInternalizePass(export_list));
> -#else
> - std::vector dso_list;
> - PM.add(llvm::createInternalizePass(export_list, dso_list));
> -#endif
>PM.run(*mod);
> }
>
> --
> 1.8.3.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] clover: fix build with LLVM 3.4
This fixes the build for me
Feel free to add my tested by
On 1 November 2013 15:25, Aaron Watry wrote:
> dso_list was added as an argument for createInternalizePass in 3.4, and
> then
> it was removed again in the same llvm version.
> ---
> src/gallium/state_trackers/clover/llvm/invocation.cpp | 5 -
> 1 file changed, 5 deletions(-)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index 4ae496f..3f50317 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -267,12 +267,7 @@ namespace {
> llvm::Function *kernel = *I;
> export_list.push_back(kernel->getName().data());
>}
> -#if HAVE_LLVM < 0x0304
>PM.add(llvm::createInternalizePass(export_list));
> -#else
> - std::vector dso_list;
> - PM.add(llvm::createInternalizePass(export_list, dso_list));
> -#endif
>PM.run(*mod);
> }
>
> --
> 1.8.3.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] clover: fix build with LLVM 3.4
dso_list was added as an argument for createInternalizePass in 3.4, and then
it was removed again in the same llvm version.
---
src/gallium/state_trackers/clover/llvm/invocation.cpp | 5 -
1 file changed, 5 deletions(-)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 4ae496f..3f50317 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -267,12 +267,7 @@ namespace {
llvm::Function *kernel = *I;
export_list.push_back(kernel->getName().data());
}
-#if HAVE_LLVM < 0x0304
PM.add(llvm::createInternalizePass(export_list));
-#else
- std::vector dso_list;
- PM.add(llvm::createInternalizePass(export_list, dso_list));
-#endif
PM.run(*mod);
}
--
1.8.3.2
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] clover: Fix build with LLVM 3.4
On Fri, Jun 28, 2013 at 09:41:45AM -0500, Aaron Watry wrote:
> PathV1.h has been removed. In theory this can go back before llvm 3.4, but I
> haven't done the research to find out how far back.
>
> Signed-off-by: Aaron Watry
I pushed a similar commit yesterday:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e990736f34c43f553d4516bc6ffb8fe521e3806
Is the build still broken even with this commit?
-Tom
> ---
> src/gallium/state_trackers/clover/llvm/invocation.cpp | 12
> 1 file changed, 12 insertions(+)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index 362f02f..ee0249d 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -43,7 +43,12 @@
> #include
> #include
> #include
> +#if HAVE_LLVM < 0x0304
> #include
> +#else
> +#include
> +#include
> +#endif
> #include
> #include
>
> @@ -222,9 +227,16 @@ namespace {
>
>llvm::PassManager PM;
>llvm::PassManagerBuilder Builder;
> +#if HAVE_LLVM < 0x0304
>llvm::sys::Path libclc_path =
> llvm::sys::Path(LIBCLC_LIBEXECDIR + processor +
> "-" + triple + ".bc");
> +#else
> + llvm::SmallString<1> libclc_path;
> + libclc_path = LIBCLC_LIBEXECDIR;
> + std::string file_name = processor + "-" + triple + ".bc";
> + llvm::sys::path::append(libclc_path, file_name);
> +#endif
>
>// Link the kernel with libclc
> #if HAVE_LLVM < 0x0303
> --
> 1.8.1.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] clover: Fix build with LLVM 3.4
Disregard this patch... Looks like Tom already pushed a fix last night.
--Aaron
On Fri, Jun 28, 2013 at 9:41 AM, Aaron Watry wrote:
> PathV1.h has been removed. In theory this can go back before llvm 3.4, but I
> haven't done the research to find out how far back.
>
> Signed-off-by: Aaron Watry
> ---
> src/gallium/state_trackers/clover/llvm/invocation.cpp | 12
> 1 file changed, 12 insertions(+)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index 362f02f..ee0249d 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -43,7 +43,12 @@
> #include
> #include
> #include
> +#if HAVE_LLVM < 0x0304
> #include
> +#else
> +#include
> +#include
> +#endif
> #include
> #include
>
> @@ -222,9 +227,16 @@ namespace {
>
>llvm::PassManager PM;
>llvm::PassManagerBuilder Builder;
> +#if HAVE_LLVM < 0x0304
>llvm::sys::Path libclc_path =
> llvm::sys::Path(LIBCLC_LIBEXECDIR + processor +
> "-" + triple + ".bc");
> +#else
> + llvm::SmallString<1> libclc_path;
> + libclc_path = LIBCLC_LIBEXECDIR;
> + std::string file_name = processor + "-" + triple + ".bc";
> + llvm::sys::path::append(libclc_path, file_name);
> +#endif
>
>// Link the kernel with libclc
> #if HAVE_LLVM < 0x0303
> --
> 1.8.1.2
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] clover: Fix build with LLVM 3.4
PathV1.h has been removed. In theory this can go back before llvm 3.4, but I
haven't done the research to find out how far back.
Signed-off-by: Aaron Watry
---
src/gallium/state_trackers/clover/llvm/invocation.cpp | 12
1 file changed, 12 insertions(+)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 362f02f..ee0249d 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -43,7 +43,12 @@
#include
#include
#include
+#if HAVE_LLVM < 0x0304
#include
+#else
+#include
+#include
+#endif
#include
#include
@@ -222,9 +227,16 @@ namespace {
llvm::PassManager PM;
llvm::PassManagerBuilder Builder;
+#if HAVE_LLVM < 0x0304
llvm::sys::Path libclc_path =
llvm::sys::Path(LIBCLC_LIBEXECDIR + processor +
"-" + triple + ".bc");
+#else
+ llvm::SmallString<1> libclc_path;
+ libclc_path = LIBCLC_LIBEXECDIR;
+ std::string file_name = processor + "-" + triple + ".bc";
+ llvm::sys::path::append(libclc_path, file_name);
+#endif
// Link the kernel with libclc
#if HAVE_LLVM < 0x0303
--
1.8.1.2
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
