Commit 1ce7e7c5 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r244728: 

------------------------------------------------------------------------
r244728 | Matthew.Arsenault | 2015-08-12 05:04:44 -0400 (Wed, 12 Aug 2015) | 2 lines

AMDGPU: Fix assert on dbg_value instructions

------------------------------------------------------------------------

llvm-svn: 253234
parent e7ecdfff

llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp

+6 −0
Original line number Diff line number Diff line
@@ -264,6 +264,12 @@ void AMDGPUAsmPrinter::getSIProgramInfo(SIProgramInfo &ProgInfo, 
  for (const MachineBasicBlock &MBB : MF) {

    for (const MachineInstr &MI : MBB) {

      // TODO: CodeSize should account for multiple functions.



      // TODO: Should we count size of debug info?

      if (MI.isDebugValue())

        continue;



      // FIXME: This is reporting 0 for many instructions.

      CodeSize += MI.getDesc().Size;



      unsigned numOperands = MI.getNumOperands();

llvm/test/CodeGen/AMDGPU/llvm.dbg.value.ll

0 → 100644
+37 −0
Original line number Diff line number Diff line 
; RUN: llc -O0 -march=amdgcn -mtriple=amdgcn-unknown-amdhsa -verify-machineinstrs < %s | FileCheck %s



; CHECK-LABEL: {{^}}test_debug_value:

; CHECK: s_load_dwordx2

; CHECK: DEBUG_VALUE: test_debug_value:globalptr_arg <- SGPR0_SGPR1

; CHECK: buffer_store_dword

; CHECK: s_endpgm

define void @test_debug_value(i32 addrspace(1)* nocapture %globalptr_arg) #0 {

entry:

  tail call void @llvm.dbg.value(metadata i32 addrspace(1)* %globalptr_arg, i64 0, metadata !10, metadata !13), !dbg !14

  store i32 123, i32 addrspace(1)* %globalptr_arg, align 4

  ret void

}



declare void @llvm.dbg.value(metadata, i64, metadata, metadata) #1



attributes #0 = { nounwind "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }

attributes #1 = { nounwind readnone }



!llvm.dbg.cu = !{!0}

!llvm.module.flags = !{!11, !12}



!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.8.0 (trunk 244715) (llvm/trunk 244718)", isOptimized: true, runtimeVersion: 0, emissionKind: 1, enums: !2, subprograms: !3)

!1 = !DIFile(filename: "/tmp/test_debug_value.cl", directory: "/Users/matt/src/llvm/build_debug")

!2 = !{}

!3 = !{!4}

!4 = !DISubprogram(name: "test_debug_value", scope: !1, file: !1, line: 1, type: !5, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: true, function: void (i32 addrspace(1)*)* @test_debug_value, variables: !9)

!5 = !DISubroutineType(types: !6)

!6 = !{null, !7}

!7 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !8, size: 64, align: 32)

!8 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)

!9 = !{!10}

!10 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "globalptr_arg", arg: 1, scope: !4, file: !1, line: 1, type: !7)

!11 = !{i32 2, !"Dwarf Version", i32 4}

!12 = !{i32 2, !"Debug Info Version", i32 3}

!13 = !DIExpression()

!14 = !DILocation(line: 1, column: 42, scope: !4)