[llvm-branch-commits] [llvm] 1bc8dab - Fix x86 exegesis tests after c042aff8860df3cad2b274bf0a495e83ae36ddee
Author: David Zarzycki
Date: 2021-01-24T08:51:06-05:00
New Revision: 1bc8daba4fa3e27c115969c4c996dd1f7d52a3e4
URL:
https://github.com/llvm/llvm-project/commit/1bc8daba4fa3e27c115969c4c996dd1f7d52a3e4
DIFF:
https://github.com/llvm/llvm-project/commit/1bc8daba4fa3e27c115969c4c996dd1f7d52a3e4.diff
LOG: Fix x86 exegesis tests after c042aff8860df3cad2b274bf0a495e83ae36ddee
In c042aff8860df3cad2b274bf0a495e83ae36ddee, unused FileCheck prefixes became
an error, which exposed some testing bugs in four exegesis tests. I've tried my
best to either fix the testing bugs, or expand the testing to cover more
scenarios.
Reviewed By: lebedev.ri
Differential Revision: https://reviews.llvm.org/D95287
Added:
Modified:
llvm/test/tools/llvm-exegesis/X86/analysis-cluster-stabilization.test
llvm/test/tools/llvm-exegesis/X86/analysis-clustering-algorithms.test
llvm/test/tools/llvm-exegesis/X86/analysis-naive-cluster-stabilization.test
llvm/test/tools/llvm-exegesis/X86/analysis-naive-clusterization.test
Removed:
diff --git
a/llvm/test/tools/llvm-exegesis/X86/analysis-cluster-stabilization.test
b/llvm/test/tools/llvm-exegesis/X86/analysis-cluster-stabilization.test
index 1579993c6b7a..8f6981ea1c2e 100644
--- a/llvm/test/tools/llvm-exegesis/X86/analysis-cluster-stabilization.test
+++ b/llvm/test/tools/llvm-exegesis/X86/analysis-cluster-stabilization.test
@@ -1,6 +1,6 @@
# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s
-analysis-clusters-output-file=- -analysis-clustering-epsilon=0.1
-analysis-inconsistency-epsilon=0.1 -analysis-numpoints=1 | FileCheck
-check-prefixes=CHECK-CLUSTERS %s
-# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s
-analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5
-analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 | FileCheck
-check-prefixes=CHECK-INCONSISTENCIES-ALL,CHECK-INCONSISTENCIES-STABLE %s
-# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s
-analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5
-analysis-inconsistency-epsilon=0.5 -analysis-display-unstable-clusters
-analysis-numpoints=1 | FileCheck
-check-prefixes=CHECK-INCONSISTENCIES-ALL,CHECK-INCONSISTENCIES-UNSTABLE %s
+# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s
-analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5
-analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1 | FileCheck
-check-prefixes=CHECK-INCONSISTENCIES-STABLE %s
+# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s
-analysis-inconsistencies-output-file=- -analysis-clustering-epsilon=0.5
-analysis-inconsistency-epsilon=0.5 -analysis-display-unstable-clusters
-analysis-numpoints=1 | FileCheck
-check-prefixes=CHECK-INCONSISTENCIES-UNSTABLE %s
# We have one ADD32rr measurement, and two measurements for SQRTSSr.
# The ADD32rr measurement and one of the SQRTSSr measurements are identical,
diff --git
a/llvm/test/tools/llvm-exegesis/X86/analysis-clustering-algorithms.test
b/llvm/test/tools/llvm-exegesis/X86/analysis-clustering-algorithms.test
index 00cb1054a691..e56a91483044 100644
--- a/llvm/test/tools/llvm-exegesis/X86/analysis-clustering-algorithms.test
+++ b/llvm/test/tools/llvm-exegesis/X86/analysis-clustering-algorithms.test
@@ -30,14 +30,14 @@
# And -analysis-clustering=naive every opcode goes into separate cluster.
-# CHECK-CLUSTERS-NAIVE-049-NEXT: {{^}}0,
-# CHECK-CLUSTERS-NAIVE-049-SAME: ,1.50{{$}}
-# CHECK-CLUSTERS-NAIVE-049: {{^}}1,
-# CHECK-CLUSTERS-NAIVE-049-SAME: ,2.00{{$}}
-# CHECK-CLUSTERS-NAIVE-049: {{^}}2,
-# CHECK-CLUSTERS-NAIVE-049-SAME: ,2.50{{$}}
-# CHECK-CLUSTERS-NAIVE-049: {{^}}3,
-# CHECK-CLUSTERS-NAIVE-049-SAME: ,1.00{{$}}
+# CHECK-CLUSTERS-NAIVE-NEXT: {{^}}0,
+# CHECK-CLUSTERS-NAIVE-SAME: ,1.50{{$}}
+# CHECK-CLUSTERS-NAIVE: {{^}}1,
+# CHECK-CLUSTERS-NAIVE-SAME: ,2.00{{$}}
+# CHECK-CLUSTERS-NAIVE: {{^}}2,
+# CHECK-CLUSTERS-NAIVE-SAME: ,2.50{{$}}
+# CHECK-CLUSTERS-NAIVE: {{^}}3,
+# CHECK-CLUSTERS-NAIVE-SAME: ,1.00{{$}}
# The "value" is manually specified, not measured.
diff --git
a/llvm/test/tools/llvm-exegesis/X86/analysis-naive-cluster-stabilization.test
b/llvm/test/tools/llvm-exegesis/X86/analysis-naive-cluster-stabilization.test
index 0ac9bbde8cdf..1d0b892062d8 100644
---
a/llvm/test/tools/llvm-exegesis/X86/analysis-naive-cluster-stabilization.test
+++
b/llvm/test/tools/llvm-exegesis/X86/analysis-naive-cluster-stabilization.test
@@ -1,17 +1,17 @@
-# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s
-analysis-clusters-output-file=- -analysis-clustering-epsilon=0.5
-analysis-inconsistency-epsilon=0.5 -analysis-numpoints=1
-analysis-clustering=naive | FileCheck
-check-prefixes=CHECK-CLUSTERS-ALL,CHECK-CLUSTERS-05 %s
+# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s
-analysis-clusters-output-file=- -analysis-clustering-epsilon=0.5
-analysis-inconsistency-epsilon=0.5 -analysis-nump
[llvm-branch-commits] [llvm] c6e341c - Revert "[dsymutil] Warn on timestmap mismatch between object file and debug map"
Author: David Zarzycki
Date: 2021-01-13T07:23:34-05:00
New Revision: c6e341c89957db31432baffb72ee015f37d8c48d
URL:
https://github.com/llvm/llvm-project/commit/c6e341c89957db31432baffb72ee015f37d8c48d
DIFF:
https://github.com/llvm/llvm-project/commit/c6e341c89957db31432baffb72ee015f37d8c48d.diff
LOG: Revert "[dsymutil] Warn on timestmap mismatch between object file and
debug map"
This reverts commit e5553b9a6ab9f02f382a31cc5117b52c3bfaf77a.
Tests are not allowed to modify the source. Please figure out a way to
use %t rather than dynamically modifying the inputs.
Added:
Modified:
llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
llvm/test/tools/dsymutil/debug-map-parsing.test
llvm/tools/dsymutil/BinaryHolder.cpp
llvm/tools/dsymutil/BinaryHolder.h
llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
Removed:
llvm/test/tools/dsymutil/Inputs/basic.macho.x86_64.o
diff --git a/llvm/test/tools/dsymutil/Inputs/basic.macho.x86_64.o
b/llvm/test/tools/dsymutil/Inputs/basic.macho.x86_64.o
deleted file mode 100644
index e69de29bb2d1..
diff --git a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
index 43d930af7128..626208ff3496 100644
--- a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
+++ b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
@@ -20,7 +20,7 @@ READOBJ-NEXT: |.|
DWARFDUMP: __swift_ast
RUN: dsymutil -oso-prepend-path %p/.. %p/../Inputs/swift-ast.macho.x86_64
-no-output -verbose 2>&1 | FileCheck %s --check-prefix=TIMESTAMP
-TIMESTAMP: warning: {{.*}}/swift-ast.swiftmodule: timestamp mismatch between
swift interface file ({{.*}}) and debug map ({{.*}})
+TIMESTAMP: warning: Timestamp mismatch
RUN: dsymutil -s
%T/swift-ast.dSYM/Contents/Resources/DWARF/swift-ast.macho.x86_64 | FileCheck
%s --check-prefix=NAST
NAST-NOT: N_AST
diff --git a/llvm/test/tools/dsymutil/debug-map-parsing.test
b/llvm/test/tools/dsymutil/debug-map-parsing.test
index 703934d38503..fb4226093da1 100644
--- a/llvm/test/tools/dsymutil/debug-map-parsing.test
+++ b/llvm/test/tools/dsymutil/debug-map-parsing.test
@@ -1,4 +1,3 @@
-RUN: touch %p/Inputs/basic.macho.x86_64.o
RUN: dsymutil -dump-debug-map -oso-prepend-path=%p
%p/Inputs/basic.macho.x86_64 | FileCheck %s
RUN: dsymutil -dump-debug-map -oso-prepend-path=%p
%p/Inputs/basic-lto.macho.x86_64 | FileCheck %s --check-prefix=CHECK-LTO
RUN: dsymutil -verbose -dump-debug-map -oso-prepend-path=%p
%p/Inputs/basic-archive.macho.x86_64 2>&1 | FileCheck %s
--check-prefix=CHECK-ARCHIVE
@@ -47,7 +46,6 @@ opening the archive once if mulitple of its members are used).
CHECK-ARCHIVE: trying to open {{.*}}basic-archive.macho.x86_64'
CHECK-ARCHIVE-NEXT:loaded object.
CHECK-ARCHIVE-NEXT: trying to open {{.*}}/Inputs/basic1.macho.x86_64.o'
-CHECK-ARCHIVE-NEXT: warning: {{.*}}/Inputs/basic1.macho.x86_64.o: timestamp
mismatch between object file ({{.*}}) and debug map ({{.*}})
CHECK-ARCHIVE-NEXT:loaded object.
CHECK-ARCHIVE-NEXT: trying to open {{.*}}/libbasic.a(basic2.macho.x86_64.o)'
CHECK-ARCHIVE-NEXT:loaded archive {{.*}}/libbasic.a'
diff --git a/llvm/tools/dsymutil/BinaryHolder.cpp
b/llvm/tools/dsymutil/BinaryHolder.cpp
index b401d519718c..df3cb7161a81 100644
--- a/llvm/tools/dsymutil/BinaryHolder.cpp
+++ b/llvm/tools/dsymutil/BinaryHolder.cpp
@@ -87,8 +87,7 @@ Error
BinaryHolder::ArchiveEntry::load(IntrusiveRefCntPtr VFS,
}
Error BinaryHolder::ObjectEntry::load(IntrusiveRefCntPtr VFS,
- StringRef Filename, TimestampTy
Timestamp,
- bool Verbose) {
+ StringRef Filename, bool Verbose) {
// Try to load regular binary and force it to be memory mapped.
auto ErrOrBuff = (Filename == "-")
? MemoryBuffer::getSTDIN()
@@ -96,17 +95,6 @@ Error
BinaryHolder::ObjectEntry::load(IntrusiveRefCntPtr VFS,
if (auto Err = ErrOrBuff.getError())
return errorCodeToError(Err);
- if (Filename != "-" && Timestamp != sys::TimePoint<>()) {
-llvm::ErrorOr Stat = VFS->status(Filename);
-if (!Stat)
- return errorCodeToError(Stat.getError());
-if (Timestamp != Stat->getLastModificationTime())
- WithColor::warning() << Filename
- << ": timestamp mismatch between object file ("
- << Stat->getLastModificationTime()
- << ") and debug map (" << Timestamp << ")\n";
- }
-
MemBuffer = std::move(*ErrOrBuff);
if (Verbose)
@@ -194,11 +182,7 @@ BinaryHolder::ArchiveEntry::getObjectEntry(StringRef
Filename,
if (Timestamp != sys::TimePoint<>() &&
Timestamp != ModTimeOrErr.get()) {
if (Verbose)
- WithColor::warning()
- << *NameOrErr
- << ": timestamp mismatch betw
[llvm-branch-commits] [lldb] 430d5d8 - [LLDB] Unbreak the build after recent clang changes
Author: David Zarzycki
Date: 2020-12-18T07:54:36-05:00
New Revision: 430d5d8429473c2b10b109991d7577a3cea41140
URL:
https://github.com/llvm/llvm-project/commit/430d5d8429473c2b10b109991d7577a3cea41140
DIFF:
https://github.com/llvm/llvm-project/commit/430d5d8429473c2b10b109991d7577a3cea41140.diff
LOG: [LLDB] Unbreak the build after recent clang changes
9e08e51a20d0d2b1c5724bb17e969d036fced4cd introduced a new enum case.
Added:
Modified:
lldb/include/lldb/lldb-enumerations.h
lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
Removed:
diff --git a/lldb/include/lldb/lldb-enumerations.h
b/lldb/include/lldb/lldb-enumerations.h
index 2679ee52136d..ff4e15e7e070 100644
--- a/lldb/include/lldb/lldb-enumerations.h
+++ b/lldb/include/lldb/lldb-enumerations.h
@@ -816,6 +816,7 @@ enum TemplateArgumentKind {
eTemplateArgumentKindExpression,
eTemplateArgumentKindPack,
eTemplateArgumentKindNullPtr,
+ eTemplateArgumentKindUncommonValue,
};
/// Options that can be set for a formatter to alter its behavior. Not
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
index 643ea7e02206..894faa847450 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -6981,6 +6981,9 @@
TypeSystemClang::GetTemplateArgumentKind(lldb::opaque_compiler_type_t type,
case clang::TemplateArgument::Pack:
return eTemplateArgumentKindPack;
+
+ case clang::TemplateArgument::UncommonValue:
+return eTemplateArgumentKindUncommonValue;
}
llvm_unreachable("Unhandled clang::TemplateArgument::ArgKind");
}
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
