This is an archive of the discontinued LLVM Phabricator instance.

Differential D65220

[InstCombine] Adjusted pow-exp tests for Windows [NFC]
ClosedPublic

Authored by xbolva00 on Jul 24 2019, 9:26 AM.

Details

Reviewers
efriedma
hans
Commits
rG1014eef04815: Merging r366925: --------------------------------------------------------------…
rL366940: Merging r366925:
rGdb913d9618cb: [InstCombine] Adjusted pow-exp tests for Windows [NFC]
rL366925: [InstCombine] Adjusted pow-exp tests for Windows [NFC]
Summary

https://bugs.llvm.org/show_bug.cgi?id=42740

Diff Detail

Repository
rL LLVM

Event Timeline

xbolva00 created this revision.Jul 24 2019, 9:26 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 24 2019, 9:26 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
xbolva00 added a subscriber: spatel.EditedJul 24 2019, 9:29 AM

In PR42740, only two tests fail on Windows. but I adjusted all related constants to use regex. Acceptable fix, @efriedma, @hans, @spatel ?

Tests pass fine for me on Linux, but I am not able to verify it on Windows. @hans please, check if it works for you. Thanks.

xbolva00 retitled this revision from [InstCombine] Adjusted tests for Windows [NFC] to [InstCombine] Adjusted pow-exp tests for Windows [NFC].Jul 24 2019, 9:35 AM
hans accepted this revision.Jul 24 2019, 9:57 AM

Tests pass fine for me on Linux, but I am not able to verify it on Windows. @hans please, check if it works for you. Thanks.

Confirmed this passes on Windows, both 32-bit and 64-bit. Thanks!

This revision is now accepted and ready to land.Jul 24 2019, 9:57 AM
Closed by commit rL366925: [InstCombine] Adjusted pow-exp tests for Windows [NFC] (authored by xbolva00). · Explain WhyJul 24 2019, 10:02 AM
This revision was automatically updated to reflect the committed changes.
xbolva00 added a comment.Jul 24 2019, 10:03 AM

Thanks!

Please backport rL366925 to release branch.

hans added a comment.Jul 24 2019, 1:03 PM
In D65220#1599492, @xbolva00 wrote:

Thanks!

Please backport rL366925 to release branch.

Merged in r366940

Revision Contents

PathSize
llvm/
trunk/
test/
Transforms/
InstCombine/
18 lines
6 lines

Diff 211543

llvm/trunk/test/Transforms/InstCombine/pow-exp.ll

Show First 20 Lines • Show All 206 Lines • ▼ Show 20 Lines
; pow(C,x) -> exp2(log2(C)*x) ; pow(C,x) -> exp2(log2(C)*x)
declare void @use_d(double) declare void @use_d(double)
declare void @use_f(float) declare void @use_f(float)
define double @pow_ok_base(double %e) { define double @pow_ok_base(double %e) {
; CHECK-LABEL: @pow_ok_base( ; CHECK-LABEL: @pow_ok_base(
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0xBFE0776228967D13 ; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0xBFE0776{{.*}}
; CHECK-NEXT: [[EXP2:%.*]] = call nnan ninf afn double @exp2(double [[MUL]]) ; CHECK-NEXT: [[EXP2:%.*]] = call nnan ninf afn double @exp2(double [[MUL]])
; CHECK-NEXT: ret double [[EXP2]] ; CHECK-NEXT: ret double [[EXP2]]
; ;
%call = tail call afn nnan ninf double @pow(double 0x3FE6666666666666, double %e) %call = tail call afn nnan ninf double @pow(double 0x3FE6666666666666, double %e)
ret double %call ret double %call
} }
define double @pow_ok_base_fast(double %e) { define double @pow_ok_base_fast(double %e) {
; CHECK-LABEL: @pow_ok_base_fast( ; CHECK-LABEL: @pow_ok_base_fast(
; CHECK-NEXT: [[MUL:%.*]] = fmul fast double [[E:%.*]], 0xBFE0776228967D13 ; CHECK-NEXT: [[MUL:%.*]] = fmul fast double [[E:%.*]], 0xBFE0776{{.*}}
; CHECK-NEXT: [[EXP2:%.*]] = call fast double @exp2(double [[MUL]]) ; CHECK-NEXT: [[EXP2:%.*]] = call fast double @exp2(double [[MUL]])
; CHECK-NEXT: ret double [[EXP2]] ; CHECK-NEXT: ret double [[EXP2]]
; ;
%call = tail call fast double @pow(double 0x3FE6666666666666, double %e) %call = tail call fast double @pow(double 0x3FE6666666666666, double %e)
ret double %call ret double %call
} }
define double @pow_ok_base2(double %e) { define double @pow_ok_base2(double %e) {
; CHECK-LABEL: @pow_ok_base2( ; CHECK-LABEL: @pow_ok_base2(
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0x4010952C788751AC ; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0x4010952{{.*}}
; CHECK-NEXT: [[EXP2:%.*]] = call nnan ninf afn double @exp2(double [[MUL]]) ; CHECK-NEXT: [[EXP2:%.*]] = call nnan ninf afn double @exp2(double [[MUL]])
; CHECK-NEXT: ret double [[EXP2]] ; CHECK-NEXT: ret double [[EXP2]]
; ;
%call = tail call afn nnan ninf double @pow(double 1.770000e+01, double %e) %call = tail call afn nnan ninf double @pow(double 1.770000e+01, double %e)
ret double %call ret double %call
} }
define double @pow_ok_base3(double %e) { define double @pow_ok_base3(double %e) {
; CHECK-LABEL: @pow_ok_base3( ; CHECK-LABEL: @pow_ok_base3(
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0x400AB0B5584886CD ; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0x400AB0B5{{.*}}
; CHECK-NEXT: [[EXP2:%.*]] = call nnan ninf afn double @exp2(double [[MUL]]) ; CHECK-NEXT: [[EXP2:%.*]] = call nnan ninf afn double @exp2(double [[MUL]])
; CHECK-NEXT: ret double [[EXP2]] ; CHECK-NEXT: ret double [[EXP2]]
; ;
%call = tail call afn nnan ninf double @pow(double 1.010000e+01, double %e) %call = tail call afn nnan ninf double @pow(double 1.010000e+01, double %e)
ret double %call ret double %call
} }
define double @pow_ok_ten_base(double %e) { define double @pow_ok_ten_base(double %e) {
; CHECK-LABEL: @pow_ok_ten_base( ; CHECK-LABEL: @pow_ok_ten_base(
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0x400A934F0979A371 ; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn double [[E:%.*]], 0x400A934F{{.*}}
; CHECK-NEXT: [[EXP2:%.*]] = call nnan ninf afn double @exp2(double [[MUL]]) ; CHECK-NEXT: [[EXP2:%.*]] = call nnan ninf afn double @exp2(double [[MUL]])
; CHECK-NEXT: ret double [[EXP2]] ; CHECK-NEXT: ret double [[EXP2]]
; ;
%call = tail call afn nnan ninf double @pow(double 1.000000e+01, double %e) %call = tail call afn nnan ninf double @pow(double 1.000000e+01, double %e)
ret double %call ret double %call
} }
define float @powf_ok_base(float %e) { define float @powf_ok_base(float %e) {
; CHECK-LABEL: @powf_ok_base( ; CHECK-LABEL: @powf_ok_base(
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0xBFE0776240000000 ; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0xBFE07762{{.*}}
; CHECK-NEXT: [[EXP2F:%.*]] = call nnan ninf afn float @exp2f(float [[MUL]]) ; CHECK-NEXT: [[EXP2F:%.*]] = call nnan ninf afn float @exp2f(float [[MUL]])
; CHECK-NEXT: ret float [[EXP2F]] ; CHECK-NEXT: ret float [[EXP2F]]
; ;
%call = tail call afn nnan ninf float @powf(float 0x3FE6666660000000, float %e) %call = tail call afn nnan ninf float @powf(float 0x3FE6666660000000, float %e)
ret float %call ret float %call
} }
define float @powf_ok_base2(float %e) { define float @powf_ok_base2(float %e) {
; CHECK-LABEL: @powf_ok_base2( ; CHECK-LABEL: @powf_ok_base2(
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0x4010952C80000000 ; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0x4010952{{.*}}
; CHECK-NEXT: [[EXP2F:%.*]] = call nnan ninf afn float @exp2f(float [[MUL]]) ; CHECK-NEXT: [[EXP2F:%.*]] = call nnan ninf afn float @exp2f(float [[MUL]])
; CHECK-NEXT: ret float [[EXP2F]] ; CHECK-NEXT: ret float [[EXP2F]]
; ;
%call = tail call afn nnan ninf float @powf(float 0x4031B33340000000, float %e) %call = tail call afn nnan ninf float @powf(float 0x4031B33340000000, float %e)
ret float %call ret float %call
} }
define float @powf_ok_base3(float %e) { define float @powf_ok_base3(float %e) {
; CHECK-LABEL: @powf_ok_base3( ; CHECK-LABEL: @powf_ok_base3(
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0x400AB0B560000000 ; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0x400AB0B5{{.*}}
; CHECK-NEXT: [[EXP2F:%.*]] = call nnan ninf afn float @exp2f(float [[MUL]]) ; CHECK-NEXT: [[EXP2F:%.*]] = call nnan ninf afn float @exp2f(float [[MUL]])
; CHECK-NEXT: ret float [[EXP2F]] ; CHECK-NEXT: ret float [[EXP2F]]
; ;
%call = tail call afn nnan ninf float @powf(float 0x4024333340000000, float %e) %call = tail call afn nnan ninf float @powf(float 0x4024333340000000, float %e)
ret float %call ret float %call
} }
define float @powf_ok_ten_base(float %e) { define float @powf_ok_ten_base(float %e) {
; CHECK-LABEL: @powf_ok_ten_base( ; CHECK-LABEL: @powf_ok_ten_base(
; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0x400A934F00000000 ; CHECK-NEXT: [[MUL:%.*]] = fmul nnan ninf afn float [[E:%.*]], 0x400A934{{.*}}
; CHECK-NEXT: [[EXP2F:%.*]] = call nnan ninf afn float @exp2f(float [[MUL]]) ; CHECK-NEXT: [[EXP2F:%.*]] = call nnan ninf afn float @exp2f(float [[MUL]])
; CHECK-NEXT: ret float [[EXP2F]] ; CHECK-NEXT: ret float [[EXP2F]]
; ;
%call = tail call afn nnan ninf float @powf(float 1.000000e+01, float %e) %call = tail call afn nnan ninf float @powf(float 1.000000e+01, float %e)
ret float %call ret float %call
} }
; Negative tests ; Negative tests
▲ Show 20 Lines • Show All 173 Lines • Show Last 20 Lines

llvm/trunk/test/Transforms/InstCombine/pow_fp_int.ll

Show First 20 Lines • Show All 193 Lines • ▼ Show 20 Lines;
ret double %res ret double %res
} }
; Negative tests ; Negative tests
define double @pow_uitofp_const_base_fast_i32(i32 %x) { define double @pow_uitofp_const_base_fast_i32(i32 %x) {
; CHECK-LABEL: @pow_uitofp_const_base_fast_i32( ; CHECK-LABEL: @pow_uitofp_const_base_fast_i32(
; CHECK-NEXT: [[SUBFP:%.*]] = uitofp i32 [[X:%.*]] to float ; CHECK-NEXT: [[SUBFP:%.*]] = uitofp i32 [[X:%.*]] to float
; CHECK-NEXT: [[MUL:%.*]] = fmul fast float [[SUBFP]], 0x4006757680000000 ; CHECK-NEXT: [[MUL:%.*]] = fmul fast float [[SUBFP]], 0x4006757{{.*}}
; CHECK-NEXT: [[EXP2:%.*]] = call fast float @llvm.exp2.f32(float [[MUL]]) ; CHECK-NEXT: [[EXP2:%.*]] = call fast float @llvm.exp2.f32(float [[MUL]])
; CHECK-NEXT: [[RES:%.*]] = fpext float [[EXP2]] to double ; CHECK-NEXT: [[RES:%.*]] = fpext float [[EXP2]] to double
; CHECK-NEXT: ret double [[RES]] ; CHECK-NEXT: ret double [[RES]]
; ;
%subfp = uitofp i32 %x to float %subfp = uitofp i32 %x to float
%pow = tail call fast float @llvm.pow.f32(float 7.000000e+00, float %subfp) %pow = tail call fast float @llvm.pow.f32(float 7.000000e+00, float %subfp)
%res = fpext float %pow to double %res = fpext float %pow to double
ret double %res ret double %res
Show All 35 Lines;
%subfp = uitofp i32 %x to double %subfp = uitofp i32 %x to double
%res = tail call fast double @llvm.pow.f64(double %base, double %subfp) %res = tail call fast double @llvm.pow.f64(double %base, double %subfp)
ret double %res ret double %res
} }
define double @pow_sitofp_const_base_fast_i64(i64 %x) { define double @pow_sitofp_const_base_fast_i64(i64 %x) {
; CHECK-LABEL: @pow_sitofp_const_base_fast_i64( ; CHECK-LABEL: @pow_sitofp_const_base_fast_i64(
; CHECK-NEXT: [[SUBFP:%.*]] = sitofp i64 [[X:%.*]] to float ; CHECK-NEXT: [[SUBFP:%.*]] = sitofp i64 [[X:%.*]] to float
; CHECK-NEXT: [[MUL:%.*]] = fmul fast float [[SUBFP]], 0x4006757680000000 ; CHECK-NEXT: [[MUL:%.*]] = fmul fast float [[SUBFP]], 0x400675{{.*}}
; CHECK-NEXT: [[EXP2:%.*]] = call fast float @llvm.exp2.f32(float [[MUL]]) ; CHECK-NEXT: [[EXP2:%.*]] = call fast float @llvm.exp2.f32(float [[MUL]])
; CHECK-NEXT: [[RES:%.*]] = fpext float [[EXP2]] to double ; CHECK-NEXT: [[RES:%.*]] = fpext float [[EXP2]] to double
; CHECK-NEXT: ret double [[RES]] ; CHECK-NEXT: ret double [[RES]]
; ;
%subfp = sitofp i64 %x to float %subfp = sitofp i64 %x to float
%pow = tail call fast float @llvm.pow.f32(float 7.000000e+00, float %subfp) %pow = tail call fast float @llvm.pow.f32(float 7.000000e+00, float %subfp)
%res = fpext float %pow to double %res = fpext float %pow to double
ret double %res ret double %res
} }
define double @pow_uitofp_const_base_fast_i64(i64 %x) { define double @pow_uitofp_const_base_fast_i64(i64 %x) {
; CHECK-LABEL: @pow_uitofp_const_base_fast_i64( ; CHECK-LABEL: @pow_uitofp_const_base_fast_i64(
; CHECK-NEXT: [[SUBFP:%.*]] = uitofp i64 [[X:%.*]] to float ; CHECK-NEXT: [[SUBFP:%.*]] = uitofp i64 [[X:%.*]] to float
; CHECK-NEXT: [[MUL:%.*]] = fmul fast float [[SUBFP]], 0x4006757680000000 ; CHECK-NEXT: [[MUL:%.*]] = fmul fast float [[SUBFP]], 0x400675{{.*}}
; CHECK-NEXT: [[EXP2:%.*]] = call fast float @llvm.exp2.f32(float [[MUL]]) ; CHECK-NEXT: [[EXP2:%.*]] = call fast float @llvm.exp2.f32(float [[MUL]])
; CHECK-NEXT: [[RES:%.*]] = fpext float [[EXP2]] to double ; CHECK-NEXT: [[RES:%.*]] = fpext float [[EXP2]] to double
; CHECK-NEXT: ret double [[RES]] ; CHECK-NEXT: ret double [[RES]]
; ;
%subfp = uitofp i64 %x to float %subfp = uitofp i64 %x to float
%pow = tail call fast float @llvm.pow.f32(float 7.000000e+00, float %subfp) %pow = tail call fast float @llvm.pow.f32(float 7.000000e+00, float %subfp)
%res = fpext float %pow to double %res = fpext float %pow to double
ret double %res ret double %res
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines