[test][InstCombine][NewPM] Fix InstCombine tests under NPM

[aeubanks]

Summary

Some of these depended on analyses being present that aren't provided
automatically in NPM.

early_dce_clobbers_callgraph.ll was previously inlining a noinline function?

cast-call-combine.ll relied on the legacy always-inline pass being a
CGSCC pass and getting rerun.

llvm/test/Transforms/InstCombine/cast-call-combine.ll

-; RUN: opt < %s -always-inline -instcombine -S | FileCheck %s
+; RUN: opt < %s -instcombine -always-inline -S | FileCheck %s
 
 define internal void @foo(i16*) alwaysinline {
   ret void
 }
 
 define void @bar() noinline noreturn {
   unreachable
 }

llvm/test/Transforms/InstCombine/early_dce_clobbers_callgraph.ll

 ; RUN: opt < %s -inline -instcombine -S | FileCheck %s
 
 ; This test case exposed a bug in instcombine where the early
 ; DCE of a call wasn't recognized as changing the IR.
 ; So when runOnFunction propagated the "made changes" upwards
 ; to the CallGraphSCCPass it signalled that no changes had been
 ; made, so CallGraphSCCPass assumed that the old CallGraph,
 ; as known by that pass manager, still was up-to-date.
 ;
 ; This was detected as an assert when trying to remove the
 ; no longer used function 'bar' (due to incorrect reference
 ; count in the CallGraph).
 
-attributes #0 = { noinline norecurse nounwind readnone }
-
-define void @foo() #0 {
+define void @foo() {
 ; CHECK-LABEL: @foo(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    ret void
 ;
 entry:
   %call = call i32 @bar()
   ret void
 }
 
-define internal i32 @bar() #0 {
+define internal i32 @bar() {
 ; CHECK-NOT: bar
 entry:
   ret i32 42
 }
 

llvm/test/Transforms/InstCombine/fputs-opt-size.ll

 ; When optimising for size, we don't want to rewrite fputs to fwrite
 ; because it requires more arguments and thus extra MOVs are required.
 ;
 ; RUN: opt < %s -instcombine -S | FileCheck %s
-; RUN: opt < %s -instcombine -pgso -S | FileCheck %s -check-prefix=PGSO
+; RUN: opt < %s -instcombine -pgso -S -enable-new-pm=0 | FileCheck %s -check-prefix=PGSO
+; RUN: opt < %s -passes='require<profile-summary>,function(instcombine)' -pgso -S | FileCheck %s -check-prefix=PGSO
 ; RUN: opt < %s -instcombine -pgso=false -S | FileCheck %s -check-prefix=NPGSO
 
 %struct._IO_FILE = type { i32, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, i8*, %struct._IO_marker*, %struct._IO_FILE*, i32, i32, i32, i16, i8, [1 x i8], i8*, i64, i8*, i8*, i8*, i8*, i32, i32, [40 x i8] }
 %struct._IO_marker = type { %struct._IO_marker*, %struct._IO_FILE*, i32 }
 
 @.str = private unnamed_addr constant [10 x i8] c"mylog.txt\00", align 1
 @.str.1 = private unnamed_addr constant [2 x i8] c"a\00", align 1
 @.str.2 = private unnamed_addr constant [27 x i8] c"Hello world this is a test\00", align 1

llvm/test/Transforms/InstCombine/gep-combine-loop-invariant.ll

 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -S | FileCheck %s
+; RUN: opt < %s -instcombine -S -enable-new-pm=0 | FileCheck %s
+; RUN: opt < %s -passes='require<loops>,instcombine' -S | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 define i32 @foo(i8* nocapture readnone %match, i32 %cur_match, i32 %best_len, i32 %scan_end, i32* nocapture readonly %prev, i32 %limit, i32 %chain_length, i8* nocapture readonly %win, i32 %wmask) {
 ; CHECK-LABEL: @foo(
 ; CHECK-NEXT:  entry:
 ; CHECK-NEXT:    [[IDX_EXT2:%.*]] = zext i32 [[CUR_MATCH:%.*]] to i64
 ; CHECK-NEXT:    [[ADD_PTR4:%.*]] = getelementptr inbounds i8, i8* [[WIN:%.*]], i64 [[IDX_EXT2]]

llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll

 ; RUN: opt < %s -disable-output -branch-prob -instcombine -block-freq -verify-dom-info
-; RUN: opt < %s -postdomtree -analyze | FileCheck --check-prefixes=CHECK-POSTDOM %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck --check-prefixes=CHECK-POSTDOM %s
 ; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck --check-prefixes=CHECK-POSTDOM %s
 
 ; Demonstrate that Predicate Canonicalization (InstCombine) does not invalidate PostDomTree
 ; if the basic block is post-dom unreachable.
 
 define void @test1(i24 %a, i24 %b) {
 entry:
   br label %LOOP