Commit 8c6b10ad authored by Bill Wendling's avatar Bill Wendling
Browse files

--- Merging r127731 into '.': 

U    test/CodeGen/X86/byval2.ll
U    test/CodeGen/X86/byval4.ll
U    test/CodeGen/X86/byval.ll
U    test/CodeGen/X86/byval3.ll
U    test/CodeGen/X86/byval5.ll
--- Merging r127732 into '.':
U    test/CodeGen/X86/stdarg.ll
U    test/CodeGen/X86/fold-mul-lohi.ll
U    test/CodeGen/X86/scalar-min-max-fill-operand.ll
U    test/CodeGen/X86/tailcallbyval64.ll
U    test/CodeGen/X86/stride-reuse.ll
U    test/CodeGen/X86/sse-align-3.ll
U    test/CodeGen/X86/sse-commute.ll
U    test/CodeGen/X86/stride-nine-with-base-reg.ll
U    test/CodeGen/X86/coalescer-commute2.ll
U    test/CodeGen/X86/sse-align-7.ll
U    test/CodeGen/X86/sse_reload_fold.ll
U    test/CodeGen/X86/sse-align-0.ll
--- Merging r127733 into '.':
U    test/CodeGen/X86/peep-vector-extract-concat.ll
U    test/CodeGen/X86/pmulld.ll
U    test/CodeGen/X86/widen_load-0.ll
U    test/CodeGen/X86/v2f32.ll
U    test/CodeGen/X86/apm.ll
U    test/CodeGen/X86/h-register-store.ll
U    test/CodeGen/X86/h-registers-0.ll
--- Merging r127734 into '.':
U    test/CodeGen/X86/2007-01-08-X86-64-Pointer.ll
U    test/CodeGen/X86/convert-2-addr-3-addr-inc64.ll
U    test/CodeGen/X86/avoid-lea-scale2.ll
U    test/CodeGen/X86/lea-3.ll
U    test/CodeGen/X86/vec_set-8.ll
U    test/CodeGen/X86/i64-mem-copy.ll
U    test/CodeGen/X86/x86-64-malloc.ll
U    test/CodeGen/X86/mmx-copy-gprs.ll
U    test/CodeGen/X86/vec_shuffle-17.ll
U    test/CodeGen/X86/2007-07-18-Vector-Extract.ll
--- Merging r127775 into '.':
U    test/CodeGen/X86/constant-pool-remat-0.ll
--- Merging r127872 into '.':
U    utils/lit/lit/TestingConfig.py
U    lib/Support/raw_ostream.cpp

llvm-svn: 128258
parent cedc390d

llvm/lib/Support/raw_ostream.cpp

+30 −0
Original line number Diff line number Diff line
@@ -220,6 +220,36 @@ raw_ostream &raw_ostream::operator<<(const void *P) { 
}



raw_ostream &raw_ostream::operator<<(double N) {

#ifdef _WIN32

  // On MSVCRT and compatible, output of %e is incompatible to Posix

  // by default. Number of exponent digits should be at least 2. "%+03d"

  // FIXME: Implement our formatter to here or Support/Format.h!

  int fpcl = _fpclass(N);



  // negative zero

  if (fpcl == _FPCLASS_NZ)

    return *this << "-0.000000e+00";



  char buf[16];

  unsigned len;

  len = snprintf(buf, sizeof(buf), "%e", N);

  if (len <= sizeof(buf) - 2) {

    if (len >= 5 && buf[len - 5] == 'e' && buf[len - 3] == '0') {

      int cs = buf[len - 4];

      if (cs == '+' || cs == '-') {

        int c1 = buf[len - 2];

        int c0 = buf[len - 1];

        if (isdigit(c1) && isdigit(c0)) {

          // Trim leading '0': "...e+012" -> "...e+12\0"

          buf[len - 3] = c1;

          buf[len - 2] = c0;

          buf[--len] = 0;

        }

      }

    }

    return this->operator<<(buf);

  }

#endif

  return this->operator<<(format("%e", N));

}

llvm/test/CodeGen/X86/2007-01-08-X86-64-Pointer.ll

+5 −2
Original line number Diff line number Diff line 
; RUN: llc %s -o - -march=x86-64 | grep {(%rdi,%rax,8)}

; RUN: llc %s -o - -march=x86-64 | not grep {addq.*8}

; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s

; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s

; CHECK-NOT: {{addq.*8}}

; CHECK:     ({{%rdi|%rcx}},%rax,8)

; CHECK-NOT: {{addq.*8}}



define void @foo(double* %y) nounwind {

entry:

llvm/test/CodeGen/X86/2007-07-18-Vector-Extract.ll

+4 −2
Original line number Diff line number Diff line 
; RUN: llc < %s -march=x86-64 -mattr=+sse | grep {movq	(%rdi), %rax}

; RUN: llc < %s -march=x86-64 -mattr=+sse | grep {movq	8(%rdi), %rax}

; RUN: llc < %s -mtriple=x86_64-linux -mattr=+sse | FileCheck %s

; RUN: llc < %s -mtriple=x86_64-win32 -mattr=+sse | FileCheck %s

; CHECK: movq ([[A0:%rdi|%rcx]]), %rax

; CHECK: movq 8([[A0]]), %rax

define i64 @foo_0(<2 x i64>* %val) {

entry:

        %val12 = getelementptr <2 x i64>* %val, i32 0, i32 0            ; <i64*> [#uses=1]

llvm/test/CodeGen/X86/apm.ll

+10 −1
Original line number Diff line number Diff line 
; RUN: llc < %s -o - -march=x86-64 | FileCheck %s

; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s

; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s -check-prefix=WIN64

; PR8573



; CHECK: foo:

; CHECK: leaq    (%rdi), %rax

; CHECK-NEXT: movl    %esi, %ecx

; CHECK-NEXT: monitor

; WIN64: foo:

; WIN64:      leaq    (%rcx), %rax

; WIN64-NEXT: movl    %edx, %ecx

; WIN64-NEXT: movl    %r8d, %edx

; WIN64-NEXT: monitor

define void @foo(i8* %P, i32 %E, i32 %H) nounwind {

entry:

  tail call void @llvm.x86.sse3.monitor(i8* %P, i32 %E, i32 %H)
@@ -17,6 +23,9 @@ declare void @llvm.x86.sse3.monitor(i8*, i32, i32) nounwind 
; CHECK: movl    %edi, %ecx

; CHECK-NEXT: movl    %esi, %eax

; CHECK-NEXT: mwait

; WIN64: bar:

; WIN64:      movl    %edx, %eax

; WIN64-NEXT: mwait

define void @bar(i32 %E, i32 %H) nounwind {

entry:

  tail call void @llvm.x86.sse3.mwait(i32 %E, i32 %H)

llvm/test/CodeGen/X86/avoid-lea-scale2.ll

+3 −1
Original line number Diff line number Diff line 
; RUN: llc < %s -march=x86-64 | grep {leal.*-2(\[%\]rdi,\[%\]rdi)}

; RUN: llc < %s -mtriple=x86_64-linux | FileCheck %s

; RUN: llc < %s -mtriple=x86_64-win32 | FileCheck %s

; CHECK: leal -2({{%rdi,%rdi|%rcx,%rcx}})



define i32 @foo(i32 %x) nounwind readnone {

  %t0 = shl i32 %x, 1