[PATCH] R600/SI: Implement i64<->f64 conversions

[Tom Stellard]

On Thu, Oct 02, 2014 at 11:15:26PM -0700, Matt Arsenault wrote:
> 
> On Oct 2, 2014, at 7:08 PM, Michel Dänzer <michel at daenzer.net> wrote:
> 
> > On 03.10.2014 09:49, Matt Arsenault wrote:
> >> Subject: [PATCH 1/3] R600/SI: Fix ftrunc f64 conformance failures.
> >> 
> >> Re-add the tests since they were deleted at some pointRe-add the tests
> >> since they were deleted at some point.
> > 
> > Duplicated commit log sentence.
> > 
> > 
> >> Subject: [PATCH 2/3] R600: Custom lower [s|u]int_to_fp for i64 -> f64
> > [...]
> >> diff --git a/test/CodeGen/R600/sint_to_fp.f64.ll b/test/CodeGen/R600/sint_to_fp.f64.ll
> >> new file mode 100644
> >> index 0000000..11a44c1
> >> --- /dev/null
> >> +++ b/test/CodeGen/R600/sint_to_fp.f64.ll
> >> @@ -0,0 +1,64 @@
> >> +; RUN: llc -march=r600 -mcpu=SI -verify-machineinstrs < %s | FileCheck -check-prefix=SI %s
> >> +
> >> +<<<<<<< HEAD:test/CodeGen/R600/sint_to_fp64.ll
> >> +; SI: {{^}}sint_to_fp64:
> >> +=======
> >> +declare i32 @llvm.r600.read.tidig.x() nounwind readnone
> >> +
> >> +; SI-LABEL: @sint_to_fp_i32_to_f64
> >> +>>>>>>> R600: Custom lower [s|u]int_to_fp for i64 -> f64:test/CodeGen/R600/sint_to_fp.f64.ll
> > 
> > You should remove these conflict markers from the second patch.
> > 
> > 
> > -- 
> > Earthling Michel Dänzer            |                  http://www.amd.com
> > Libre software enthusiast          |                Mesa and X developer
> 
> 
> Fixed:
> 

Hi Matt,

All 3 of these patches look good to me.

-Tom