diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/TableGen/CodeGenTarget.cpp | 2 | ||||
| -rw-r--r-- | utils/TableGen/SubtargetEmitter.cpp | 9 | ||||
| -rwxr-xr-x | utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest | 2 | ||||
| -rw-r--r-- | utils/lit/tests/discovery.py | 4 | ||||
| -rw-r--r-- | utils/lit/tests/unittest-adaptor.py | 4 | ||||
| -rw-r--r-- | utils/lit/tests/xunit-output.py | 4 |
6 files changed, 14 insertions, 11 deletions
diff --git a/utils/TableGen/CodeGenTarget.cpp b/utils/TableGen/CodeGenTarget.cpp index e79a809b6d16..47d68fc339ae 100644 --- a/utils/TableGen/CodeGenTarget.cpp +++ b/utils/TableGen/CodeGenTarget.cpp @@ -297,7 +297,7 @@ void CodeGenTarget::ComputeInstrsByEnum() const { "IMPLICIT_DEF", "SUBREG_TO_REG", "COPY_TO_REGCLASS", "DBG_VALUE", "REG_SEQUENCE", "COPY", "BUNDLE", "LIFETIME_START", "LIFETIME_END", "STACKMAP", "PATCHPOINT", "LOAD_STACK_GUARD", - "STATEPOINT", "FRAME_ALLOC", + "STATEPOINT", "FRAME_ALLOC", "FAULTING_LOAD_OP", nullptr}; const auto &Insts = getInstructions(); for (const char *const *p = FixedInstrs; *p; ++p) { diff --git a/utils/TableGen/SubtargetEmitter.cpp b/utils/TableGen/SubtargetEmitter.cpp index de9c7a656a0d..e5d75771cc80 100644 --- a/utils/TableGen/SubtargetEmitter.cpp +++ b/utils/TableGen/SubtargetEmitter.cpp @@ -1437,7 +1437,7 @@ void SubtargetEmitter::run(raw_ostream &OS) { // MCInstrInfo initialization routine. OS << "static inline void Init" << Target << "MCSubtargetInfo(MCSubtargetInfo *II, " - << "StringRef TT, StringRef CPU, StringRef FS) {\n"; + << "const Triple &TT, StringRef CPU, StringRef FS) {\n"; OS << " II->InitMCSubtargetInfo(TT, CPU, FS, "; if (NumFeatures) OS << Target << "FeatureKV, "; @@ -1482,10 +1482,11 @@ void SubtargetEmitter::run(raw_ostream &OS) { OS << "namespace llvm {\n"; OS << "class DFAPacketizer;\n"; OS << "struct " << ClassName << " : public TargetSubtargetInfo {\n" - << " explicit " << ClassName << "(StringRef TT, StringRef CPU, " + << " explicit " << ClassName << "(const Triple &TT, StringRef CPU, " << "StringRef FS);\n" << "public:\n" - << " unsigned resolveSchedClass(unsigned SchedClass, const MachineInstr *DefMI," + << " unsigned resolveSchedClass(unsigned SchedClass, " + << " const MachineInstr *DefMI," << " const TargetSchedModel *SchedModel) const override;\n" << " DFAPacketizer *createDFAPacketizer(const InstrItineraryData *IID)" << " const;\n" @@ -1515,7 +1516,7 @@ void SubtargetEmitter::run(raw_ostream &OS) { OS << "extern const unsigned " << Target << "ForwardingPaths[];\n"; } - OS << ClassName << "::" << ClassName << "(StringRef TT, StringRef CPU, " + OS << ClassName << "::" << ClassName << "(const Triple &TT, StringRef CPU, " << "StringRef FS)\n" << " : TargetSubtargetInfo() {\n" << " InitMCSubtargetInfo(TT, CPU, FS, "; diff --git a/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest b/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest index 9dff137f4dec..dd49f025b1f2 100755 --- a/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest +++ b/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest @@ -21,6 +21,7 @@ elif not sys.argv[1].startswith("--gtest_filter="): test_name = sys.argv[1].split('=',1)[1] if test_name == 'FirstTest.subTestA': print('I am subTest A, I PASS') + print('[ PASSED ] 1 test.') sys.exit(0) elif test_name == 'FirstTest.subTestB': print('I am subTest B, I FAIL') @@ -29,6 +30,7 @@ elif test_name == 'FirstTest.subTestB': elif test_name in ('ParameterizedTest/0.subTest', 'ParameterizedTest/1.subTest'): print('I am a parameterized test, I also PASS') + print('[ PASSED ] 1 test.') sys.exit(0) else: raise SystemExit("error: invalid test name: %r" % (test_name,)) diff --git a/utils/lit/tests/discovery.py b/utils/lit/tests/discovery.py index 28010894cda6..60f67dcd740e 100644 --- a/utils/lit/tests/discovery.py +++ b/utils/lit/tests/discovery.py @@ -7,8 +7,8 @@ # RUN: FileCheck --check-prefix=CHECK-BASIC-ERR < %t.err %s # # CHECK-BASIC-ERR: loading suite config '{{.*}}/discovery/lit.cfg' -# CHECK-BASIC-ERR: loading local config '{{.*}}/discovery/subdir/lit.local.cfg' # CHECK-BASIC-ERR: loading suite config '{{.*}}/discovery/subsuite/lit.cfg' +# CHECK-BASIC-ERR: loading local config '{{.*}}/discovery/subdir/lit.local.cfg' # # CHECK-BASIC-OUT: -- Test Suites -- # CHECK-BASIC-OUT: sub-suite - 2 tests @@ -51,8 +51,8 @@ # CHECK-ASEXEC-ERR: load_config from '{{.*}}/discovery/lit.cfg' # CHECK-ASEXEC-ERR: loaded config '{{.*}}/discovery/lit.cfg' # CHECK-ASEXEC-ERR: loaded config '{{.*}}/exec-discovery/lit.site.cfg' -# CHECK-ASEXEC-ERR: loading local config '{{.*}}/discovery/subdir/lit.local.cfg' # CHECK-ASEXEC-ERR: loading suite config '{{.*}}/discovery/subsuite/lit.cfg' +# CHECK-ASEXEC-ERR: loading local config '{{.*}}/discovery/subdir/lit.local.cfg' # # CHECK-ASEXEC-OUT: -- Test Suites -- # CHECK-ASEXEC-OUT: sub-suite - 2 tests diff --git a/utils/lit/tests/unittest-adaptor.py b/utils/lit/tests/unittest-adaptor.py index 7435dda41968..0848cd22baae 100644 --- a/utils/lit/tests/unittest-adaptor.py +++ b/utils/lit/tests/unittest-adaptor.py @@ -3,8 +3,8 @@ # RUN: %{python} %s %{inputs}/unittest-adaptor 2> %t.err # RUN: FileCheck < %t.err %s # -# CHECK: unittest-adaptor :: test-one.txt ... ok -# CHECK: unittest-adaptor :: test-two.txt ... FAIL +# CHECK-DAG: unittest-adaptor :: test-two.txt ... FAIL +# CHECK-DAG: unittest-adaptor :: test-one.txt ... ok import unittest import sys diff --git a/utils/lit/tests/xunit-output.py b/utils/lit/tests/xunit-output.py index 87652290f47d..3f4939536379 100644 --- a/utils/lit/tests/xunit-output.py +++ b/utils/lit/tests/xunit-output.py @@ -5,6 +5,6 @@ # CHECK: <?xml version="1.0" encoding="UTF-8" ?> # CHECK: <testsuites> # CHECK: <testsuite name='test-data' tests='1' failures='0'> -# CHECK: <testcase classname='test-data.' name='metrics.ini' time='0.00'/> +# CHECK: <testcase classname='test-data.test-data' name='metrics.ini' time='0.{{[0-9]+}}'/> # CHECK: </testsuite> -# CHECK: </testsuites>
\ No newline at end of file +# CHECK: </testsuites> |