Skip to content

Commit 4a14de7

Browse files
committed
Disable NewPM by default
This also reverts commit 59ecd8783b36e1ba2b42e020d46456329554f107, which is directly related to default pass manager type.
1 parent 683af1b commit 4a14de7

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
// Check LLVM optimization pipeline is run by default for SPIR-V compiled for
22
// SYCL device target, and can be disabled with -fno-sycl-early-optimizations.
33
//
4-
// RUN: %clang_cc1 -O2 -fsycl -fsycl-is-device -triple spir64-unknown-unknown-sycldevice %s -fdebug-pass-manager -emit-llvm -o - 2>&1 | FileCheck %s --check-prefix=CHECK-EARLYOPT
5-
// CHECK-EARLYOPT: Starting llvm::Module pass manager run.
6-
// CHECK-EARLYOPT: Running pass: GlobalOptPass
7-
// CHECK-EARLYOPT: Running pass: GlobalDCEPass
8-
// CHECK-EARLYOPT: Running pass: PrintModulePass on
4+
// RUN: %clang_cc1 -O2 -fsycl -fsycl-is-device -triple spir64-unknown-unknown-sycldevice %s -mllvm -debug-pass=Structure -emit-llvm -o - 2>&1 | FileCheck %s --check-prefix=CHECK-EARLYOPT
5+
// CHECK-EARLYOPT: Lower Work Group Scope Code
6+
// CHECK-EARLYOPT: Combine redundant instructions
97
//
10-
// RUN: %clang_cc1 -O2 -fsycl -fsycl-is-device -fno-sycl-early-optimizations -triple spir64-unknown-unknown-sycldevice %s -fdebug-pass-manager -emit-llvm -o - 2>&1 | FileCheck %s --check-prefix=CHECK-NOEARLYOPT
11-
// CHECK-NOEARLYOPT: Starting llvm::Module pass manager run.
12-
// CHECK-NOEARLYOPT-NEXT: Running pass: PrintModulePass on
8+
// RUN: %clang_cc1 -O2 -fsycl -fsycl-is-device -fno-sycl-early-optimizations -triple spir64-unknown-unknown-sycldevice %s -mllvm -debug-pass=Structure -emit-llvm -o - 2>&1 | FileCheck %s --check-prefix=CHECK-NOEARLYOPT
9+
// CHECK-NOEARLYOPT: Lower Work Group Scope Code
10+
// CHECK-NOEARLYOPT-NOT: Combine redundant instructions

llvm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ else()
694694
endif()
695695
option(LLVM_ENABLE_PLUGINS "Enable plugin support" ${LLVM_ENABLE_PLUGINS_default})
696696

697-
set(ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER TRUE CACHE BOOL
697+
set(ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER FALSE CACHE BOOL
698698
"Enable the new pass manager by default.")
699699

700700
include(HandleLLVMOptions)

0 commit comments

Comments
 (0)