<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><br><div><div>On Oct 3, 2014, at 11:33 AM, Tom Stellard <<a href="mailto:tom@stellard.net">tom@stellard.net</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">On Thu, Oct 02, 2014 at 11:15:26PM -0700, Matt Arsenault wrote:<br><blockquote type="cite"><br>On Oct 2, 2014, at 7:08 PM, Michel Dänzer <<a href="mailto:michel@daenzer.net">michel@daenzer.net</a>> wrote:<br><br><blockquote type="cite">On 03.10.2014 09:49, Matt Arsenault wrote:<br><blockquote type="cite">Subject: [PATCH 1/3] R600/SI: Fix ftrunc f64 conformance failures.<br><br>Re-add the tests since they were deleted at some pointRe-add the tests<br>since they were deleted at some point.<br></blockquote><br>Duplicated commit log sentence.<br><br><br><blockquote type="cite">Subject: [PATCH 2/3] R600: Custom lower [s|u]int_to_fp for i64 -> f64<br></blockquote>[...]<br><blockquote type="cite">diff --git a/test/CodeGen/R600/sint_to_fp.f64.ll b/test/CodeGen/R600/sint_to_fp.f64.ll<br>new file mode 100644<br>index 0000000..11a44c1<br>--- /dev/null<br>+++ b/test/CodeGen/R600/sint_to_fp.f64.ll<br>@@ -0,0 +1,64 @@<br>+; RUN: llc -march=r600 -mcpu=SI -verify-machineinstrs < %s | FileCheck -check-prefix=SI %s<br>+<br>+<<<<<<< HEAD:test/CodeGen/R600/sint_to_fp64.ll<br>+; SI: {{^}}sint_to_fp64:<br>+=======<br>+declare i32 @llvm.r600.read.tidig.x() nounwind readnone<br>+<br>+; SI-LABEL: @sint_to_fp_i32_to_f64<br>+>>>>>>> R600: Custom lower [s|u]int_to_fp for i64 -> f64:test/CodeGen/R600/sint_to_fp.f64.ll<br></blockquote><br>You should remove these conflict markers from the second patch.<br><br><br>--<span class="Apple-converted-space"> </span><br>Earthling Michel Dänzer | <a href="http://www.amd.com">http://www.amd.com</a><br>Libre software enthusiast | Mesa and X developer<br></blockquote><br><br>Fixed:<br><br></blockquote><br>Hi Matt,<br><br>All 3 of these patches look good to me.<br><br>-Tom</div></blockquote></div><br><div>r219036-r219038</div></body></html>