From 8a3ef6f3c3603a9cb6f2cd21b70d739a14d931d7 Mon Sep 17 00:00:00 2001
From: Dean Michael Berris <dberris@google.com>
Date: Fri, 2 Nov 2018 08:35:46 +0000
Subject: [PATCH] [XRay] Fix tests with updated fdr-dump

Follow-up to D54022.

llvm-svn: 345955
---
 llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt | 12 ++++++------
 llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt           |  4 ++--
 llvm/unittests/XRay/FDRRecordPrinterTest.cpp              |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt b/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt
index 3530301..ccb8a1b 100644
--- a/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt
+++ b/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt
@@ -12,14 +12,14 @@
 ; CHECK-NEXT:  <CPU: id = 6, tsc = 2034042117104344>
 ; CHECK-NEXT:  <TSC Wrap: base = 2034042117104344>
 ; CHECK-EMPTY:
-; CHECK-NEXT: -  <Function Enter: #3 delta = +3>
-; CHECK-NEXT: -  <Function Exit: #3 delta = +3>
-; CHECK-NEXT: -  <Function Enter: #2 delta = +2>
-; CHECK-NEXT: -  <Function Exit: #2 delta = +2>
+; CHECK-NEXT: -  <Function Enter: #3 delta = +0>
+; CHECK-NEXT: -  <Function Exit: #3 delta = +94744>
+; CHECK-NEXT: -  <Function Enter: #2 delta = +1028487290>
+; CHECK-NEXT: -  <Function Exit: #2 delta = +75822>
 ; CHECK-EMPTY:
 ; CHECK-NEXT: Metadata: <TSC Wrap: base = 2034049739853430>
 ; CHECK-EMPTY:
-; CHECK-NEXT: -  <Function Enter: #1 delta = +1>
+; CHECK-NEXT: -  <Function Enter: #1 delta = +0>
 ; CHECK-NEXT:  : <Call Argument: data = 67 (hex = 0x43)>
-; CHECK-NEXT: -  <Function Exit: #1 delta = +1>
+; CHECK-NEXT: -  <Function Exit: #1 delta = +24724>
 
diff --git a/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt b/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt
index df39f6d..8fb381a 100644
--- a/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt
+++ b/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt
@@ -9,8 +9,8 @@
 ; CHECK-NEXT:  <CPU: id = 49, tsc = 18828908666540172>
 ; CHECK-NEXT:  <TSC Wrap: base = 18828908666540172>
 ; CHECK-EMPTY:
-; CHECK-NEXT: -  <Function Enter: #1 delta = +1>
+; CHECK-NEXT: -  <Function Enter: #1 delta = +3146>
 ; CHECK-NEXT:  : <Call Argument: data = 1 (hex = 0x1)>
-; CHECK-NEXT: -  <Function Exit: #1 delta = +1>
+; CHECK-NEXT: -  <Function Exit: #1 delta = +52286>
 ; CHECK-NEXT:  *** <End of Buffer>
 
diff --git a/llvm/unittests/XRay/FDRRecordPrinterTest.cpp b/llvm/unittests/XRay/FDRRecordPrinterTest.cpp
index 321892e..a0ec3f2 100644
--- a/llvm/unittests/XRay/FDRRecordPrinterTest.cpp
+++ b/llvm/unittests/XRay/FDRRecordPrinterTest.cpp
@@ -132,7 +132,7 @@ TEST(FDRRecordPrinterTest, WriteFunctionRecordEnter) {
   FunctionRecord R(RecordTypes::ENTER, 1, 2);
   ASSERT_FALSE(errorToBool(R.apply(P)));
   OS.flush();
-  EXPECT_THAT(Data, Eq("<Function Enter: #1 delta = +1>"));
+  EXPECT_THAT(Data, Eq("<Function Enter: #1 delta = +2>"));
 }
 
 TEST(FDRRecordPrinterTest, WriteFunctionRecordExit) {
@@ -142,7 +142,7 @@ TEST(FDRRecordPrinterTest, WriteFunctionRecordExit) {
   FunctionRecord R(RecordTypes::EXIT, 1, 2);
   ASSERT_FALSE(errorToBool(R.apply(P)));
   OS.flush();
-  EXPECT_THAT(Data, Eq("<Function Exit: #1 delta = +1>"));
+  EXPECT_THAT(Data, Eq("<Function Exit: #1 delta = +2>"));
 }
 
 TEST(FDRRecordPrinterTest, WriteFunctionRecordTailExit) {
@@ -152,7 +152,7 @@ TEST(FDRRecordPrinterTest, WriteFunctionRecordTailExit) {
   FunctionRecord R(RecordTypes::TAIL_EXIT, 1, 2);
   ASSERT_FALSE(errorToBool(R.apply(P)));
   OS.flush();
-  EXPECT_THAT(Data, Eq("<Function Tail Exit: #1 delta = +1>"));
+  EXPECT_THAT(Data, Eq("<Function Tail Exit: #1 delta = +2>"));
 }
 
 TEST(FDRRecordPrinterTest, WriteFunctionRecordEnterArg) {
@@ -162,7 +162,7 @@ TEST(FDRRecordPrinterTest, WriteFunctionRecordEnterArg) {
   FunctionRecord R(RecordTypes::ENTER_ARG, 1, 2);
   ASSERT_FALSE(errorToBool(R.apply(P)));
   OS.flush();
-  EXPECT_THAT(Data, Eq("<Function Enter With Arg: #1 delta = +1>"));
+  EXPECT_THAT(Data, Eq("<Function Enter With Arg: #1 delta = +2>"));
 }
 
 } // namespace
-- 
2.7.4