[Mesa-dev] clover: Use Legacy PassManager for LLVM trunk (3.7)

Submitted by Shawn Starr on Feb. 14, 2015, 1:37 a.m.

Details

Message ID 3039438.ufmgEo50BU@segfault
State New, archived
Headers show

Not browsing as part of any series.

Commit Message

Shawn Starr Feb. 14, 2015, 1:37 a.m.
From: Shawn Starr <shawn.starr at rogers.com>

Use the LegacyPassManager for now.

Signed-off-by: Shawn Starr <shawn.starr@rogers.com>
---
 src/gallium/state_trackers/clover/llvm/invocation.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp 
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 0794e61..3c2ca49 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -44,7 +44,11 @@ 
 #if HAVE_LLVM < 0x0305
 #include <llvm/ADT/OwningPtr.h>
 #endif
+#if HAVE_LLVM >= 0x0307
+#include <llvm/IR/LegacyPassManager.h>
+#else
 #include <llvm/PassManager.h>
+#endif
 #include <llvm/Support/CodeGen.h>
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Support/MemoryBuffer.h>
@@ -298,7 +302,12 @@  namespace {
    optimize(llvm::Module *mod, unsigned optimization_level,
             const std::vector<llvm::Function *> &kernels) {
 
-      llvm::PassManager PM;
+#ifdef HAVE_LLVM >= 0x0307
+      llvm::legacy::PassManager PM;
+#else
+      llvm:PassManager PM;
+#endif
+
       // Add a function internalizer pass.
       //
       // By default, the function internalizer pass will look for a function

Comments

On Fri, Feb 13, 2015 at 5:37 PM, Shawn Starr <shawn.starr@rogers.com> wrote:
> From: Shawn Starr <shawn.starr at rogers.com>

s/ at /@/

>
> Use the LegacyPassManager for now.
>
> Signed-off-by: Shawn Starr <shawn.starr@rogers.com>
> ---
>  src/gallium/state_trackers/clover/llvm/invocation.cpp | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index 0794e61..3c2ca49 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -44,7 +44,11 @@
>  #if HAVE_LLVM < 0x0305
>  #include <llvm/ADT/OwningPtr.h>
>  #endif
> +#if HAVE_LLVM >= 0x0307
> +#include <llvm/IR/LegacyPassManager.h>
> +#else
>  #include <llvm/PassManager.h>
> +#endif
>  #include <llvm/Support/CodeGen.h>
>  #include <llvm/Support/TargetSelect.h>
>  #include <llvm/Support/MemoryBuffer.h>
> @@ -298,7 +302,12 @@ namespace {
>     optimize(llvm::Module *mod, unsigned optimization_level,
>              const std::vector<llvm::Function *> &kernels) {
>
> -      llvm::PassManager PM;
> +#ifdef HAVE_LLVM >= 0x0307
> +      llvm::legacy::PassManager PM;
> +#else
> +      llvm:PassManager PM;

: looks like an obvious typo.