[llvm-commits] [llvm] r43191 - in /llvm/trunk: lib/CodeGen/BranchFolding.cpp test/CFrontend/2007-10-15-VoidPtr.c test/Transforms/BranchFolding/ test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll

[Bill Wendling]

Author: void
Date: Fri Oct 19 16:09:55 2007
New Revision: 43191

URL: http://llvm.org/viewvc/llvm-project?rev=43191&view=rev
Log:
Don't branch fold inline asm statements.

Added:
    llvm/trunk/test/Transforms/BranchFolding/
    llvm/trunk/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll
Modified:
    llvm/trunk/lib/CodeGen/BranchFolding.cpp
    llvm/trunk/test/CFrontend/2007-10-15-VoidPtr.c

Modified: llvm/trunk/lib/CodeGen/BranchFolding.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BranchFolding.cpp?rev=43191&r1=43190&r2=43191&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/BranchFolding.cpp (original)
+++ llvm/trunk/lib/CodeGen/BranchFolding.cpp Fri Oct 19 16:09:55 2007
@@ -271,7 +271,8 @@
   unsigned TailLen = 0;
   while (I1 != MBB1->begin() && I2 != MBB2->begin()) {
     --I1; --I2;
-    if (!I1->isIdenticalTo(I2)) {
+    if (!I1->isIdenticalTo(I2) || 
+        I1->getOpcode() == TargetInstrInfo::INLINEASM) {
       ++I1; ++I2;
       break;
     }

Modified: llvm/trunk/test/CFrontend/2007-10-15-VoidPtr.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CFrontend/2007-10-15-VoidPtr.c?rev=43191&r1=43190&r2=43191&view=diff

==============================================================================
--- llvm/trunk/test/CFrontend/2007-10-15-VoidPtr.c (original)
+++ llvm/trunk/test/CFrontend/2007-10-15-VoidPtr.c Fri Oct 19 16:09:55 2007
@@ -1,5 +1,4 @@
-// RUN: llvm-gcc -S %s -o /dev/null
+// RUN: %llvmgcc -S %s -o /dev/null
 void bork(void **data) {
   (*(unsigned short *) (&(data[37])[927]) = 0);
 }
-

Added: llvm/trunk/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll?rev=43191&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll (added)
+++ llvm/trunk/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll Fri Oct 19 16:09:55 2007
@@ -0,0 +1,18 @@
+; RUN: llvm-as < %s | opt -std-compile-opts -o - | llc -o - | grep bork_directive | wc -l | grep 2
+
+;; We don't want branch folding to fold asm directives.
+
+define void @bork(i32 %param) {
+entry:
+	%tmp = icmp eq i32 %param, 0
+        br i1 %tmp, label %cond_true, label %cond_false
+
+cond_true:   
+        call void asm sideeffect ".bork_directive /* ${0:c}:${1:c} */", "i,i,~{dirflag},~{fpsr},~{flags}"( i32 37, i32 927 )
+        ret void
+
+cond_false:
+	call void asm sideeffect ".foo_directive ${0:c}:${1:c}", "i,i,~{dirflag},~{fpsr},~{flags}"( i32 37, i32 927 )
+        call void asm sideeffect ".bork_directive /* ${0:c}:${1:c} */", "i,i,~{dirflag},~{fpsr},~{flags}"( i32 37, i32 927 )
+        ret void
+}