Index: llvm/trunk/test/Transforms/InstCombine/clamp-to-minmax.ll =================================================================== --- llvm/trunk/test/Transforms/InstCombine/clamp-to-minmax.ll +++ llvm/trunk/test/Transforms/InstCombine/clamp-to-minmax.ll @@ -143,6 +143,7 @@ ; Some more checks with fast ; (X > 1.0) ? min(x, 255.0) : 1.0 +; That did not match because select was in inverse order. define float @clamp_test_1(float %x) { ; CHECK-LABEL: @clamp_test_1( ; CHECK-NEXT: [[INNER_CMP_INV:%.*]] = fcmp fast oge float [[X:%.*]], 2.550000e+02 @@ -498,3 +499,109 @@ %r = select i1 %cmp1, float 255.0, float %max ; 255.0 ret float %r } + +;; Check casts behavior +define float @ui32_clamp_and_cast_to_float(i32 %x) { +; CHECK-LABEL: @ui32_clamp_and_cast_to_float( +; CHECK-NEXT: [[F_X:%.*]] = uitofp i32 [[X:%.*]] to float +; CHECK-NEXT: [[UP_CMP:%.*]] = icmp ugt i32 [[X]], 255 +; CHECK-NEXT: [[LO_CMP:%.*]] = icmp eq i32 [[X]], 0 +; CHECK-NEXT: [[MIN:%.*]] = select i1 [[UP_CMP]], float 2.550000e+02, float [[F_X]] +; CHECK-NEXT: [[R:%.*]] = select i1 [[LO_CMP]], float 1.000000e+00, float [[MIN]] +; CHECK-NEXT: ret float [[R]] +; + %f_x = uitofp i32 %x to float + %up_cmp = icmp ugt i32 %x, 255 + %lo_cmp = icmp ult i32 %x, 1 + %min = select i1 %up_cmp, float 255.0, float %f_x + %r = select i1 %lo_cmp, float 1.0, float %min + ret float %r +} + +define float @ui64_clamp_and_cast_to_float(i64 %x) { +; CHECK-LABEL: @ui64_clamp_and_cast_to_float( +; CHECK-NEXT: [[LO_CMP:%.*]] = icmp eq i64 [[X:%.*]], 0 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i64 [[X]], 255 +; CHECK-NEXT: [[MIN1:%.*]] = select i1 [[TMP1]], i64 [[X]], i64 255 +; CHECK-NEXT: [[TMP2:%.*]] = uitofp i64 [[MIN1]] to float +; CHECK-NEXT: [[R:%.*]] = select i1 [[LO_CMP]], float 1.000000e+00, float [[TMP2]] +; CHECK-NEXT: ret float [[R]] +; + %f_x = uitofp i64 %x to float + %up_cmp = icmp ugt i64 %x, 255 + %lo_cmp = icmp ult i64 %x, 1 + %min = select i1 %up_cmp, float 255.0, float %f_x + %r = select i1 %lo_cmp, float 1.0, float %min + ret float %r +} + +define float @mixed_clamp_to_float_1(i32 %x) { +; CHECK-LABEL: @mixed_clamp_to_float_1( +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[X:%.*]], 255 +; CHECK-NEXT: [[SI_MIN:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 255 +; CHECK-NEXT: [[F_MIN:%.*]] = sitofp i32 [[SI_MIN]] to float +; CHECK-NEXT: [[LO_CMP:%.*]] = icmp slt i32 [[X]], 1 +; CHECK-NEXT: [[R:%.*]] = select i1 [[LO_CMP]], float 1.000000e+00, float [[F_MIN]] +; CHECK-NEXT: ret float [[R]] +; + %si_min_cmp = icmp sgt i32 %x, 255 + %si_min = select i1 %si_min_cmp, i32 255, i32 %x + %f_min = sitofp i32 %si_min to float + %f_x = sitofp i32 %x to float + %lo_cmp = fcmp ult float %f_x, 1.0 + %r = select i1 %lo_cmp, float 1.0, float %f_min + ret float %r +} + +define i32 @mixed_clamp_to_i32_1(float %x) { +; CHECK-LABEL: @mixed_clamp_to_i32_1( +; CHECK-NEXT: [[FLOAT_MIN_CMP:%.*]] = fcmp ogt float [[X:%.*]], 2.550000e+02 +; CHECK-NEXT: [[FLOAT_MIN:%.*]] = select i1 [[FLOAT_MIN_CMP]], float 2.550000e+02, float [[X]] +; CHECK-NEXT: [[I32_MIN:%.*]] = fptosi float [[FLOAT_MIN]] to i32 +; CHECK-NEXT: [[I32_X:%.*]] = fptosi float [[X]] to i32 +; CHECK-NEXT: [[LO_CMP:%.*]] = icmp eq i32 [[I32_X]], 0 +; CHECK-NEXT: [[R:%.*]] = select i1 [[LO_CMP]], i32 1, i32 [[I32_MIN]] +; CHECK-NEXT: ret i32 [[R]] +; + %float_min_cmp = fcmp ogt float %x, 255.0 + %float_min = select i1 %float_min_cmp, float 255.0, float %x + %i32_min = fptosi float %float_min to i32 + %i32_x = fptosi float %x to i32 + %lo_cmp = icmp ult i32 %i32_x, 1 + %r = select i1 %lo_cmp, i32 1, i32 %i32_min + ret i32 %r +} + +define float @mixed_clamp_to_float_2(i32 %x) { +; CHECK-LABEL: @mixed_clamp_to_float_2( +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[X:%.*]], 255 +; CHECK-NEXT: [[SI_MIN:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 255 +; CHECK-NEXT: [[F_MIN:%.*]] = sitofp i32 [[SI_MIN]] to float +; CHECK-NEXT: [[LO_CMP:%.*]] = icmp slt i32 [[X]], 1 +; CHECK-NEXT: [[R:%.*]] = select i1 [[LO_CMP]], float 1.000000e+00, float [[F_MIN]] +; CHECK-NEXT: ret float [[R]] +; + %si_min_cmp = icmp sgt i32 %x, 255 + %si_min = select i1 %si_min_cmp, i32 255, i32 %x + %f_min = sitofp i32 %si_min to float + %lo_cmp = icmp slt i32 %x, 1 + %r = select i1 %lo_cmp, float 1.0, float %f_min + ret float %r +} + +define i32 @mixed_clamp_to_i32_2(float %x) { +; CHECK-LABEL: @mixed_clamp_to_i32_2( +; CHECK-NEXT: [[FLOAT_MIN_CMP:%.*]] = fcmp ogt float [[X:%.*]], 2.550000e+02 +; CHECK-NEXT: [[FLOAT_MIN:%.*]] = select i1 [[FLOAT_MIN_CMP]], float 2.550000e+02, float [[X]] +; CHECK-NEXT: [[I32_MIN:%.*]] = fptosi float [[FLOAT_MIN]] to i32 +; CHECK-NEXT: [[LO_CMP:%.*]] = fcmp olt float [[X]], 1.000000e+00 +; CHECK-NEXT: [[R:%.*]] = select i1 [[LO_CMP]], i32 1, i32 [[I32_MIN]] +; CHECK-NEXT: ret i32 [[R]] +; + %float_min_cmp = fcmp ogt float %x, 255.0 + %float_min = select i1 %float_min_cmp, float 255.0, float %x + %i32_min = fptosi float %float_min to i32 + %lo_cmp = fcmp olt float %x, 1.0 + %r = select i1 %lo_cmp, i32 1, i32 %i32_min + ret i32 %r +} Index: llvm/trunk/test/Transforms/InstCombine/minmax-fold.ll =================================================================== --- llvm/trunk/test/Transforms/InstCombine/minmax-fold.ll +++ llvm/trunk/test/Transforms/InstCombine/minmax-fold.ll @@ -4,8 +4,8 @@ ; This is the canonical form for a type-changing min/max. define i64 @t1(i32 %a) { ; CHECK-LABEL: @t1( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 %a, 5 -; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 %a, i32 5 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[A:%.*]], 5 +; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 [[A]], i32 5 ; CHECK-NEXT: [[TMP3:%.*]] = sext i32 [[TMP2]] to i64 ; CHECK-NEXT: ret i64 [[TMP3]] ; @@ -18,8 +18,8 @@ ; Check this is converted into canonical form, as above. define i64 @t2(i32 %a) { ; CHECK-LABEL: @t2( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 %a, 5 -; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 %a, i32 5 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[A:%.*]], 5 +; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 [[A]], i32 5 ; CHECK-NEXT: [[TMP3:%.*]] = sext i32 [[TMP2]] to i64 ; CHECK-NEXT: ret i64 [[TMP3]] ; @@ -32,8 +32,8 @@ ; Same as @t2, with flipped operands and zext instead of sext. define i64 @t3(i32 %a) { ; CHECK-LABEL: @t3( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 %a, 5 -; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 %a, i32 5 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 [[A:%.*]], 5 +; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 [[A]], i32 5 ; CHECK-NEXT: [[TMP3:%.*]] = zext i32 [[TMP2]] to i64 ; CHECK-NEXT: ret i64 [[TMP3]] ; @@ -46,8 +46,8 @@ ; Same again, with trunc. define i32 @t4(i64 %a) { ; CHECK-LABEL: @t4( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i64 %a, 5 -; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i64 %a, i64 5 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i64 [[A:%.*]], 5 +; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i64 [[A]], i64 5 ; CHECK-NEXT: [[TMP3:%.*]] = trunc i64 [[TMP2]] to i32 ; CHECK-NEXT: ret i32 [[TMP3]] ; @@ -61,8 +61,8 @@ ; InstCombine should leave this alone. define i64 @t5(i32 %a) { ; CHECK-LABEL: @t5( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 %a, 5 -; CHECK-NEXT: [[TMP2:%.*]] = zext i32 %a to i64 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[A:%.*]], 5 +; CHECK-NEXT: [[TMP2:%.*]] = zext i32 [[A]] to i64 ; CHECK-NEXT: [[TMP3:%.*]] = select i1 [[TMP1]], i64 5, i64 [[TMP2]] ; CHECK-NEXT: ret i64 [[TMP3]] ; @@ -74,8 +74,8 @@ define float @t6(i32 %a) { ; CHECK-LABEL: @t6( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 %a, 0 -; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 %a, i32 0 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[A:%.*]], 0 +; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 [[A]], i32 0 ; CHECK-NEXT: [[TMP3:%.*]] = sitofp i32 [[TMP2]] to float ; CHECK-NEXT: ret float [[TMP3]] ; @@ -87,8 +87,8 @@ define i16 @t7(i32 %a) { ; CHECK-LABEL: @t7( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 %a, -32768 -; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 %a, i32 -32768 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[A:%.*]], -32768 +; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 [[A]], i32 -32768 ; CHECK-NEXT: [[TMP3:%.*]] = trunc i32 [[TMP2]] to i16 ; CHECK-NEXT: ret i16 [[TMP3]] ; @@ -104,12 +104,12 @@ ; parts of instcombine. define i32 @t8(i64 %a, i32 %b) { ; CHECK-LABEL: @t8( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i64 %a, -32767 -; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i64 %a, i64 -32767 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i64 [[A:%.*]], -32767 +; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i64 [[A]], i64 -32767 ; CHECK-NEXT: [[TMP3:%.*]] = trunc i64 [[TMP2]] to i32 -; CHECK-NEXT: [[TMP4:%.*]] = icmp slt i32 %b, 42 +; CHECK-NEXT: [[TMP4:%.*]] = icmp slt i32 [[B:%.*]], 42 ; CHECK-NEXT: [[TMP5:%.*]] = select i1 [[TMP4]], i32 42, i32 [[TMP3]] -; CHECK-NEXT: [[TMP6:%.*]] = icmp ne i32 [[TMP5]], %b +; CHECK-NEXT: [[TMP6:%.*]] = icmp ne i32 [[TMP5]], [[B]] ; CHECK-NEXT: [[TMP7:%.*]] = zext i1 [[TMP6]] to i32 ; CHECK-NEXT: ret i32 [[TMP7]] ; @@ -126,8 +126,8 @@ ; Ensure this doesn't get converted to a min/max. define i64 @t9(i32 %a) { ; CHECK-LABEL: @t9( -; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 %a, -1 -; CHECK-NEXT: [[TMP2:%.*]] = sext i32 %a to i64 +; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 [[A:%.*]], -1 +; CHECK-NEXT: [[TMP2:%.*]] = sext i32 [[A]] to i64 ; CHECK-NEXT: [[TMP3:%.*]] = select i1 [[TMP1]], i64 [[TMP2]], i64 4294967295 ; CHECK-NEXT: ret i64 [[TMP3]] ; @@ -137,12 +137,38 @@ ret i64 %3 } +define float @t10(i32 %x) { +; CHECK-LABEL: @t10( +; CHECK-NEXT: [[F_X:%.*]] = sitofp i32 [[X:%.*]] to float +; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i32 [[X]], 255 +; CHECK-NEXT: [[R:%.*]] = select i1 [[CMP]], float [[F_X]], float 2.550000e+02 +; CHECK-NEXT: ret float [[R]] +; + %f_x = sitofp i32 %x to float + %cmp = icmp sgt i32 %x, 255 + %r = select i1 %cmp, float %f_x, float 255.0 + ret float %r +} + +define float @t11(i64 %x) { +; CHECK-LABEL: @t11( +; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i64 [[X:%.*]], 255 +; CHECK-NEXT: [[R1:%.*]] = select i1 [[TMP1]], i64 [[X]], i64 255 +; CHECK-NEXT: [[TMP2:%.*]] = sitofp i64 [[R1]] to float +; CHECK-NEXT: ret float [[TMP2]] +; + %f_x = sitofp i64 %x to float + %cmp = icmp sgt i64 %x, 255 + %r = select i1 %cmp, float %f_x, float 255.0 + ret float %r +} + ; Reuse the first 2 bitcasts as the select operands. define <4 x i32> @bitcasts_fcmp_1(<2 x i64> %a, <2 x i64> %b) { ; CHECK-LABEL: @bitcasts_fcmp_1( -; CHECK-NEXT: [[T0:%.*]] = bitcast <2 x i64> %a to <4 x float> -; CHECK-NEXT: [[T1:%.*]] = bitcast <2 x i64> %b to <4 x float> +; CHECK-NEXT: [[T0:%.*]] = bitcast <2 x i64> [[A:%.*]] to <4 x float> +; CHECK-NEXT: [[T1:%.*]] = bitcast <2 x i64> [[B:%.*]] to <4 x float> ; CHECK-NEXT: [[T2:%.*]] = fcmp olt <4 x float> [[T1]], [[T0]] ; CHECK-NEXT: [[TMP1:%.*]] = select <4 x i1> [[T2]], <4 x float> [[T0]], <4 x float> [[T1]] ; CHECK-NEXT: [[T5:%.*]] = bitcast <4 x float> [[TMP1]] to <4 x i32> @@ -161,8 +187,8 @@ define <4 x i32> @bitcasts_fcmp_2(<2 x i64> %a, <2 x i64> %b) { ; CHECK-LABEL: @bitcasts_fcmp_2( -; CHECK-NEXT: [[T0:%.*]] = bitcast <2 x i64> %a to <4 x float> -; CHECK-NEXT: [[T1:%.*]] = bitcast <2 x i64> %b to <4 x float> +; CHECK-NEXT: [[T0:%.*]] = bitcast <2 x i64> [[A:%.*]] to <4 x float> +; CHECK-NEXT: [[T1:%.*]] = bitcast <2 x i64> [[B:%.*]] to <4 x float> ; CHECK-NEXT: [[T2:%.*]] = fcmp olt <4 x float> [[T0]], [[T1]] ; CHECK-NEXT: [[TMP1:%.*]] = select <4 x i1> [[T2]], <4 x float> [[T0]], <4 x float> [[T1]] ; CHECK-NEXT: [[T5:%.*]] = bitcast <4 x float> [[TMP1]] to <4 x i32> @@ -181,8 +207,8 @@ define <4 x float> @bitcasts_icmp(<2 x i64> %a, <2 x i64> %b) { ; CHECK-LABEL: @bitcasts_icmp( -; CHECK-NEXT: [[T0:%.*]] = bitcast <2 x i64> %a to <4 x i32> -; CHECK-NEXT: [[T1:%.*]] = bitcast <2 x i64> %b to <4 x i32> +; CHECK-NEXT: [[T0:%.*]] = bitcast <2 x i64> [[A:%.*]] to <4 x i32> +; CHECK-NEXT: [[T1:%.*]] = bitcast <2 x i64> [[B:%.*]] to <4 x i32> ; CHECK-NEXT: [[T2:%.*]] = icmp slt <4 x i32> [[T1]], [[T0]] ; CHECK-NEXT: [[TMP1:%.*]] = select <4 x i1> [[T2]], <4 x i32> [[T0]], <4 x i32> [[T1]] ; CHECK-NEXT: [[T5:%.*]] = bitcast <4 x i32> [[TMP1]] to <4 x float> @@ -200,8 +226,8 @@ ; SMIN(SMIN(X, 11), 92) -> SMIN(X, 11) define i32 @test68(i32 %x) { ; CHECK-LABEL: @test68( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 %x, 11 -; CHECK-NEXT: [[COND:%.*]] = select i1 [[TMP1]], i32 %x, i32 11 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[X:%.*]], 11 +; CHECK-NEXT: [[COND:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 11 ; CHECK-NEXT: ret i32 [[COND]] ; %cmp = icmp slt i32 11, %x @@ -213,8 +239,8 @@ define <2 x i32> @test68vec(<2 x i32> %x) { ; CHECK-LABEL: @test68vec( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt <2 x i32> %x, -; CHECK-NEXT: [[COND:%.*]] = select <2 x i1> [[TMP1]], <2 x i32> %x, <2 x i32> +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt <2 x i32> [[X:%.*]], +; CHECK-NEXT: [[COND:%.*]] = select <2 x i1> [[TMP1]], <2 x i32> [[X]], <2 x i32> ; CHECK-NEXT: ret <2 x i32> [[COND]] ; %cmp = icmp slt <2 x i32> , %x @@ -227,8 +253,8 @@ ; MIN(MIN(X, 24), 83) -> MIN(X, 24) define i32 @test69(i32 %x) { ; CHECK-LABEL: @test69( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 %x, 24 -; CHECK-NEXT: [[COND:%.*]] = select i1 [[TMP1]], i32 %x, i32 24 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 [[X:%.*]], 24 +; CHECK-NEXT: [[COND:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 24 ; CHECK-NEXT: ret i32 [[COND]] ; %cmp = icmp ult i32 24, %x @@ -241,8 +267,8 @@ ; SMAX(SMAX(X, 75), 36) -> SMAX(X, 75) define i32 @test70(i32 %x) { ; CHECK-LABEL: @test70( -; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 %x, 75 -; CHECK-NEXT: [[COND:%.*]] = select i1 [[TMP1]], i32 %x, i32 75 +; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 [[X:%.*]], 75 +; CHECK-NEXT: [[COND:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 75 ; CHECK-NEXT: ret i32 [[COND]] ; %cmp = icmp slt i32 %x, 75 @@ -255,8 +281,8 @@ ; MAX(MAX(X, 68), 47) -> MAX(X, 68) define i32 @test71(i32 %x) { ; CHECK-LABEL: @test71( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 %x, 68 -; CHECK-NEXT: [[COND:%.*]] = select i1 [[TMP1]], i32 %x, i32 68 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 [[X:%.*]], 68 +; CHECK-NEXT: [[COND:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 68 ; CHECK-NEXT: ret i32 [[COND]] ; %cmp = icmp ult i32 %x, 68 @@ -269,8 +295,8 @@ ; SMIN(SMIN(X, 92), 11) -> SMIN(X, 11) define i32 @test72(i32 %x) { ; CHECK-LABEL: @test72( -; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 %x, 11 -; CHECK-NEXT: [[RETVAL:%.*]] = select i1 [[TMP1]], i32 %x, i32 11 +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[X:%.*]], 11 +; CHECK-NEXT: [[RETVAL:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 11 ; CHECK-NEXT: ret i32 [[RETVAL]] ; %cmp = icmp sgt i32 %x, 92 @@ -282,8 +308,8 @@ define <2 x i32> @test72vec(<2 x i32> %x) { ; CHECK-LABEL: @test72vec( -; CHECK-NEXT: [[TMP2:%.*]] = icmp slt <2 x i32> %x, -; CHECK-NEXT: [[RETVAL:%.*]] = select <2 x i1> [[TMP2]], <2 x i32> %x, <2 x i32> +; CHECK-NEXT: [[TMP1:%.*]] = icmp slt <2 x i32> [[X:%.*]], +; CHECK-NEXT: [[RETVAL:%.*]] = select <2 x i1> [[TMP1]], <2 x i32> [[X]], <2 x i32> ; CHECK-NEXT: ret <2 x i32> [[RETVAL]] ; %cmp = icmp sgt <2 x i32> %x, @@ -296,8 +322,8 @@ ; MIN(MIN(X, 83), 24) -> MIN(X, 24) define i32 @test73(i32 %x) { ; CHECK-LABEL: @test73( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 %x, 24 -; CHECK-NEXT: [[RETVAL:%.*]] = select i1 [[TMP1]], i32 %x, i32 24 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 [[X:%.*]], 24 +; CHECK-NEXT: [[RETVAL:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 24 ; CHECK-NEXT: ret i32 [[RETVAL]] ; %cmp = icmp ugt i32 %x, 83 @@ -310,8 +336,8 @@ ; SMAX(SMAX(X, 36), 75) -> SMAX(X, 75) define i32 @test74(i32 %x) { ; CHECK-LABEL: @test74( -; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 %x, 75 -; CHECK-NEXT: [[RETVAL:%.*]] = select i1 [[TMP1]], i32 %x, i32 75 +; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 [[X:%.*]], 75 +; CHECK-NEXT: [[RETVAL:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 75 ; CHECK-NEXT: ret i32 [[RETVAL]] ; %cmp = icmp slt i32 %x, 36 @@ -324,8 +350,8 @@ ; MAX(MAX(X, 47), 68) -> MAX(X, 68) define i32 @test75(i32 %x) { ; CHECK-LABEL: @test75( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 %x, 68 -; CHECK-NEXT: [[RETVAL:%.*]] = select i1 [[TMP1]], i32 %x, i32 68 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 [[X:%.*]], 68 +; CHECK-NEXT: [[RETVAL:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 68 ; CHECK-NEXT: ret i32 [[RETVAL]] ; %cmp = icmp ult i32 %x, 47 @@ -342,8 +368,8 @@ define i32 @clamp_signed1(i32 %x) { ; CHECK-LABEL: @clamp_signed1( -; CHECK-NEXT: [[CMP2:%.*]] = icmp slt i32 %x, 255 -; CHECK-NEXT: [[MIN:%.*]] = select i1 [[CMP2]], i32 %x, i32 255 +; CHECK-NEXT: [[CMP2:%.*]] = icmp slt i32 [[X:%.*]], 255 +; CHECK-NEXT: [[MIN:%.*]] = select i1 [[CMP2]], i32 [[X]], i32 255 ; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 [[MIN]], 15 ; CHECK-NEXT: [[R:%.*]] = select i1 [[TMP1]], i32 [[MIN]], i32 15 ; CHECK-NEXT: ret i32 [[R]] @@ -359,8 +385,8 @@ define i32 @clamp_signed2(i32 %x) { ; CHECK-LABEL: @clamp_signed2( -; CHECK-NEXT: [[CMP2:%.*]] = icmp sgt i32 %x, 15 -; CHECK-NEXT: [[MAX:%.*]] = select i1 [[CMP2]], i32 %x, i32 15 +; CHECK-NEXT: [[CMP2:%.*]] = icmp sgt i32 [[X:%.*]], 15 +; CHECK-NEXT: [[MAX:%.*]] = select i1 [[CMP2]], i32 [[X]], i32 15 ; CHECK-NEXT: [[TMP1:%.*]] = icmp slt i32 [[MAX]], 255 ; CHECK-NEXT: [[R:%.*]] = select i1 [[TMP1]], i32 [[MAX]], i32 255 ; CHECK-NEXT: ret i32 [[R]] @@ -376,8 +402,8 @@ define i32 @clamp_unsigned1(i32 %x) { ; CHECK-LABEL: @clamp_unsigned1( -; CHECK-NEXT: [[CMP2:%.*]] = icmp ult i32 %x, 255 -; CHECK-NEXT: [[MIN:%.*]] = select i1 [[CMP2]], i32 %x, i32 255 +; CHECK-NEXT: [[CMP2:%.*]] = icmp ult i32 [[X:%.*]], 255 +; CHECK-NEXT: [[MIN:%.*]] = select i1 [[CMP2]], i32 [[X]], i32 255 ; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 [[MIN]], 15 ; CHECK-NEXT: [[R:%.*]] = select i1 [[TMP1]], i32 [[MIN]], i32 15 ; CHECK-NEXT: ret i32 [[R]] @@ -393,8 +419,8 @@ define i32 @clamp_unsigned2(i32 %x) { ; CHECK-LABEL: @clamp_unsigned2( -; CHECK-NEXT: [[CMP2:%.*]] = icmp ugt i32 %x, 15 -; CHECK-NEXT: [[MAX:%.*]] = select i1 [[CMP2]], i32 %x, i32 15 +; CHECK-NEXT: [[CMP2:%.*]] = icmp ugt i32 [[X:%.*]], 15 +; CHECK-NEXT: [[MAX:%.*]] = select i1 [[CMP2]], i32 [[X]], i32 15 ; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 [[MAX]], 255 ; CHECK-NEXT: [[R:%.*]] = select i1 [[TMP1]], i32 [[MAX]], i32 255 ; CHECK-NEXT: ret i32 [[R]] @@ -410,8 +436,8 @@ define double @PR31751_umin1(i32 %x) { ; CHECK-LABEL: @PR31751_umin1( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 %x, 2147483647 -; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP1]], i32 %x, i32 2147483647 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 [[X:%.*]], 2147483647 +; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 2147483647 ; CHECK-NEXT: [[CONV:%.*]] = sitofp i32 [[SEL]] to double ; CHECK-NEXT: ret double [[CONV]] ; @@ -423,8 +449,8 @@ define double @PR31751_umin2(i32 %x) { ; CHECK-LABEL: @PR31751_umin2( -; CHECK-NEXT: [[CMP:%.*]] = icmp ult i32 %x, 2147483647 -; CHECK-NEXT: [[SEL:%.*]] = select i1 [[CMP]], i32 %x, i32 2147483647 +; CHECK-NEXT: [[CMP:%.*]] = icmp ult i32 [[X:%.*]], 2147483647 +; CHECK-NEXT: [[SEL:%.*]] = select i1 [[CMP]], i32 [[X]], i32 2147483647 ; CHECK-NEXT: [[CONV:%.*]] = sitofp i32 [[SEL]] to double ; CHECK-NEXT: ret double [[CONV]] ; @@ -436,8 +462,8 @@ define double @PR31751_umin3(i32 %x) { ; CHECK-LABEL: @PR31751_umin3( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 %x, 2147483647 -; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP1]], i32 %x, i32 2147483647 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i32 [[X:%.*]], 2147483647 +; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 2147483647 ; CHECK-NEXT: [[CONV:%.*]] = sitofp i32 [[SEL]] to double ; CHECK-NEXT: ret double [[CONV]] ; @@ -451,8 +477,8 @@ define double @PR31751_umax1(i32 %x) { ; CHECK-LABEL: @PR31751_umax1( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 %x, -2147483648 -; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP1]], i32 %x, i32 -2147483648 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 [[X:%.*]], -2147483648 +; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 -2147483648 ; CHECK-NEXT: [[CONV:%.*]] = sitofp i32 [[SEL]] to double ; CHECK-NEXT: ret double [[CONV]] ; @@ -464,8 +490,8 @@ define double @PR31751_umax2(i32 %x) { ; CHECK-LABEL: @PR31751_umax2( -; CHECK-NEXT: [[CMP:%.*]] = icmp ugt i32 %x, -2147483648 -; CHECK-NEXT: [[SEL:%.*]] = select i1 [[CMP]], i32 %x, i32 -2147483648 +; CHECK-NEXT: [[CMP:%.*]] = icmp ugt i32 [[X:%.*]], -2147483648 +; CHECK-NEXT: [[SEL:%.*]] = select i1 [[CMP]], i32 [[X]], i32 -2147483648 ; CHECK-NEXT: [[CONV:%.*]] = sitofp i32 [[SEL]] to double ; CHECK-NEXT: ret double [[CONV]] ; @@ -477,8 +503,8 @@ define double @PR31751_umax3(i32 %x) { ; CHECK-LABEL: @PR31751_umax3( -; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 %x, -2147483648 -; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP1]], i32 %x, i32 -2147483648 +; CHECK-NEXT: [[TMP1:%.*]] = icmp ugt i32 [[X:%.*]], -2147483648 +; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP1]], i32 [[X]], i32 -2147483648 ; CHECK-NEXT: [[CONV:%.*]] = sitofp i32 [[SEL]] to double ; CHECK-NEXT: ret double [[CONV]] ; @@ -492,8 +518,8 @@ define float @bitcast_scalar_smax(float %x, float %y) { ; CHECK-LABEL: @bitcast_scalar_smax( -; CHECK-NEXT: [[BCX:%.*]] = bitcast float %x to i32 -; CHECK-NEXT: [[BCY:%.*]] = bitcast float %y to i32 +; CHECK-NEXT: [[BCX:%.*]] = bitcast float [[X:%.*]] to i32 +; CHECK-NEXT: [[BCY:%.*]] = bitcast float [[Y:%.*]] to i32 ; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i32 [[BCX]], [[BCY]] ; CHECK-NEXT: [[SEL:%.*]] = select i1 [[CMP]], i32 [[BCX]], i32 [[BCY]] ; CHECK-NEXT: [[BCS:%.*]] = bitcast i32 [[SEL]] to float @@ -511,10 +537,10 @@ define float @bitcast_scalar_umax(float %x, float %y) { ; CHECK-LABEL: @bitcast_scalar_umax( -; CHECK-NEXT: [[BCX:%.*]] = bitcast float %x to i32 -; CHECK-NEXT: [[BCY:%.*]] = bitcast float %y to i32 +; CHECK-NEXT: [[BCX:%.*]] = bitcast float [[X:%.*]] to i32 +; CHECK-NEXT: [[BCY:%.*]] = bitcast float [[Y:%.*]] to i32 ; CHECK-NEXT: [[CMP:%.*]] = icmp ugt i32 [[BCX]], [[BCY]] -; CHECK-NEXT: [[SEL:%.*]] = select i1 [[CMP]], float %x, float %y +; CHECK-NEXT: [[SEL:%.*]] = select i1 [[CMP]], float [[X]], float [[Y]] ; CHECK-NEXT: ret float [[SEL]] ; %bcx = bitcast float %x to i32 @@ -529,8 +555,8 @@ define <8 x float> @bitcast_vector_smin(<8 x float> %x, <8 x float> %y) { ; CHECK-LABEL: @bitcast_vector_smin( -; CHECK-NEXT: [[BCX:%.*]] = bitcast <8 x float> %x to <8 x i32> -; CHECK-NEXT: [[BCY:%.*]] = bitcast <8 x float> %y to <8 x i32> +; CHECK-NEXT: [[BCX:%.*]] = bitcast <8 x float> [[X:%.*]] to <8 x i32> +; CHECK-NEXT: [[BCY:%.*]] = bitcast <8 x float> [[Y:%.*]] to <8 x i32> ; CHECK-NEXT: [[CMP:%.*]] = icmp slt <8 x i32> [[BCX]], [[BCY]] ; CHECK-NEXT: [[SEL:%.*]] = select <8 x i1> [[CMP]], <8 x i32> [[BCX]], <8 x i32> [[BCY]] ; CHECK-NEXT: [[BCS:%.*]] = bitcast <8 x i32> [[SEL]] to <8 x float> @@ -548,10 +574,10 @@ define <8 x float> @bitcast_vector_umin(<8 x float> %x, <8 x float> %y) { ; CHECK-LABEL: @bitcast_vector_umin( -; CHECK-NEXT: [[BCX:%.*]] = bitcast <8 x float> %x to <8 x i32> -; CHECK-NEXT: [[BCY:%.*]] = bitcast <8 x float> %y to <8 x i32> +; CHECK-NEXT: [[BCX:%.*]] = bitcast <8 x float> [[X:%.*]] to <8 x i32> +; CHECK-NEXT: [[BCY:%.*]] = bitcast <8 x float> [[Y:%.*]] to <8 x i32> ; CHECK-NEXT: [[CMP:%.*]] = icmp slt <8 x i32> [[BCX]], [[BCY]] -; CHECK-NEXT: [[SEL:%.*]] = select <8 x i1> [[CMP]], <8 x float> %x, <8 x float> %y +; CHECK-NEXT: [[SEL:%.*]] = select <8 x i1> [[CMP]], <8 x float> [[X]], <8 x float> [[Y]] ; CHECK-NEXT: ret <8 x float> [[SEL]] ; %bcx = bitcast <8 x float> %x to <8 x i32> @@ -560,4 +586,3 @@ %sel = select <8 x i1> %cmp, <8 x float> %x, <8 x float> %y ret <8 x float> %sel } - Index: llvm/trunk/test/Transforms/InstCombine/pr27236.ll =================================================================== --- llvm/trunk/test/Transforms/InstCombine/pr27236.ll +++ llvm/trunk/test/Transforms/InstCombine/pr27236.ll @@ -3,18 +3,17 @@ define float @test1(i32 %scale) { ; CHECK-LABEL: @test1( -; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 %scale, 1 -; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 %scale, i32 1 +; CHECK-NEXT: [[TMP1:%.*]] = icmp sgt i32 [[SCALE:%.*]], 1 +; CHECK-NEXT: [[TMP2:%.*]] = select i1 [[TMP1]], i32 [[SCALE]], i32 1 ; CHECK-NEXT: [[TMP3:%.*]] = sitofp i32 [[TMP2]] to float ; CHECK-NEXT: [[TMP4:%.*]] = icmp sgt i32 [[TMP2]], 0 ; CHECK-NEXT: [[SEL:%.*]] = select i1 [[TMP4]], float [[TMP3]], float 0.000000e+00 ; CHECK-NEXT: ret float [[SEL]] ; - %tmp1 = icmp sgt i32 1, %scale - %tmp2 = select i1 %tmp1, i32 1, i32 %scale - %tmp3 = sitofp i32 %tmp2 to float - %tmp4 = icmp sgt i32 %tmp2, 0 - %sel = select i1 %tmp4, float %tmp3, float 0.000000e+00 + %1 = icmp sgt i32 1, %scale + %2 = select i1 %1, i32 1, i32 %scale + %3 = sitofp i32 %2 to float + %4 = icmp sgt i32 %2, 0 + %sel = select i1 %4, float %3, float 0.000000e+00 ret float %sel } -