Changes in code.

Change-Id: I83157361996ab7642185536ed11a73fb9b127f0f

Author: aratajew

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -1325,10 +1325,7 @@ void OptimizeIR(CodeGenContext* pContext)
             // Use CFGSimplification to do clean-up. Needs to be invoked before lowerSwitch.
             mpm.add(llvm::createCFGSimplificationPass());
 
-            // run instruction combining to clean up the code after CFG optimizations
-            mpm.add(createIGCInstructionCombiningPass());
-
-            if (IGC_IS_FLAG_DISABLED(DisableFlattenSmallSwitch))
+            if(IGC_IS_FLAG_DISABLED(DisableFlattenSmallSwitch))
             {
                 mpm.add(createFlattenSmallSwitchPass());
             }
@@ -1337,6 +1334,9 @@ void OptimizeIR(CodeGenContext* pContext)
             // After lowering 'switch', run jump threading to remove redundant jumps.
             mpm.add(llvm::createJumpThreadingPass());
 
+            // run instruction combining to clean up the code after CFG optimizations
+            mpm.add(createIGCInstructionCombiningPass());
+
             mpm.add(llvm::createDeadCodeEliminationPass());
             mpm.add(llvm::createEarlyCSEPass());