[llvm] r175237 - Fix minor mips16 issues in directives for function prologue. Probably this does

[reed kotler]

Uh oh... let me take a look.


On 02/14/2013 05:37 PM, Anna Zaks wrote:
> Looks like this commit has triggered a bunch of test failures:
>
> http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/1791
>
> Anna.
> On Feb 14, 2013, at 5:04 PM, Reed Kotler <rkotler at mips.com> wrote:
>
>> Author: rkotler
>> Date: Thu Feb 14 19:04:38 2013
>> New Revision: 175237
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=175237&view=rev
>> Log:
>> Fix minor mips16 issues in directives for function prologue. Probably this does
>> not matter but makes it more gcc compatible which avoids possible subtle
>> problems. Also, turned back on a disabled check in helloworld.ll.
>>
>>
>> Modified:
>>     llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
>>     llvm/trunk/test/CodeGen/Mips/helloworld.ll
>>
>> Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp?rev=175237&r1=175236&r2=175237&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp (original)
>> +++ llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp Thu Feb 14 19:04:38 2013
>> @@ -236,10 +236,11 @@ void MipsAsmPrinter::EmitFunctionBodySta
>>      raw_svector_ostream OS(Str);
>>      printSavedRegsBitmask(OS);
>>      OutStreamer.EmitRawText(OS.str());
>> -
>> -    OutStreamer.EmitRawText(StringRef("\t.set\tnoreorder"));
>> -    OutStreamer.EmitRawText(StringRef("\t.set\tnomacro"));
>> -    OutStreamer.EmitRawText(StringRef("\t.set\tnoat"));
>> +    if (!Subtarget->inMips16Mode()) {
>> +      OutStreamer.EmitRawText(StringRef("\t.set\tnoreorder"));
>> +      OutStreamer.EmitRawText(StringRef("\t.set\tnomacro"));
>> +      OutStreamer.EmitRawText(StringRef("\t.set\tnoat"));
>> +    }
>>    }
>> }
>>
>> @@ -250,9 +251,11 @@ void MipsAsmPrinter::EmitFunctionBodyEnd
>>    // always be at the function end, and we can't emit and
>>    // break with BB logic.
>>    if (OutStreamer.hasRawTextSupport()) {
>> -    OutStreamer.EmitRawText(StringRef("\t.set\tat"));
>> -    OutStreamer.EmitRawText(StringRef("\t.set\tmacro"));
>> -    OutStreamer.EmitRawText(StringRef("\t.set\treorder"));
>> +    if (!Subtarget->inMips16Mode()) {
>> +      OutStreamer.EmitRawText(StringRef("\t.set\tat"));
>> +      OutStreamer.EmitRawText(StringRef("\t.set\tmacro"));
>> +      OutStreamer.EmitRawText(StringRef("\t.set\treorder"));
>> +    }
>>      OutStreamer.EmitRawText("\t.end\t" + Twine(CurrentFnSym->getName()));
>>    }
>> }
>>
>> Modified: llvm/trunk/test/CodeGen/Mips/helloworld.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/helloworld.ll?rev=175237&r1=175236&r2=175237&view=diff
>> ==============================================================================
>> --- llvm/trunk/test/CodeGen/Mips/helloworld.ll (original)
>> +++ llvm/trunk/test/CodeGen/Mips/helloworld.ll Thu Feb 14 19:04:38 2013
>> @@ -4,8 +4,8 @@
>> ; RUN: llc  -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s | FileCheck %s -check-prefix=ST1
>> ; RUN: llc  -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s | FileCheck %s -check-prefix=ST2
>> ;
>> -; re-enable this when mips16's jalr is fixed.
>> -; DISABLED: llc  -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=SR
>> +; RUN: llc  -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=SR
>> +; RUN: llc  -march=mipsel -mcpu=mips32  -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=SR32
>>
>>
>> @.str = private unnamed_addr constant [13 x i8] c"hello world\0A\00", align 1
>> @@ -17,7 +17,15 @@ entry:
>>
>> ; SR: 	.set	mips16                  # @main
>>
>> -; SR:	save 	$ra, [[FS:[0-9]+]]
>> +; SR32: .set nomips16
>> +; SR32: .ent main
>> +; SR-NOT:  .set noreorder
>> +; SR-NOT:  .set nomacro
>> +; SR-NOT:  .set noat
>> +; SR32:  .set noreorder
>> +; SR32:  .set nomacro
>> +; SR32:  .set noat
>> +; SR:	save 	$ra, $s0, $s1, [[FS:[0-9]+]]
>> ; PE:	li	$[[T1:[0-9]+]], %hi(_gp_disp)
>> ; PE: 	addiu	$[[T2:[0-9]+]], $pc, %lo(_gp_disp)
>> ; PE:	sll	$[[T3:[0-9]+]], $[[T1]], 16
>> @@ -27,7 +35,7 @@ entry:
>> ; C2:	move	$25, ${{[0-9]+}}
>> ; C1:	move 	$gp, ${{[0-9]+}}
>> ; C1:	jalrc 	${{[0-9]+}}
>> -; SR:	restore 	$ra, [[FS]]
>> +; SR:	restore 	$ra, $s0, $s1, [[FS]]
>> ; PE:	li	$2, 0
>> ; PE:	jrc 	$ra
>>
>> @@ -38,4 +46,12 @@ entry:
>> ; ST2:  jal     printf
>> }
>>
>> +;  SR-NOT:  .set at
>> +;  SR-NOT:  .set macro
>> +;  SR-NOT:  .set reorder
>> +;  SR32:  .set at
>> +;  SR32:  .set macro
>> +;  SR32:  .set reorder
>> +; SR:   .end main
>> +; SR32:   .end main
>> declare i32 @printf(i8*, ...)
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits