From 16e7bd3b25bb5715e5161926713094a2982c9c7a Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 12 Jul 2021 17:24:59 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.btrace/tsx.exp on system with tsx disabled in microcode Recently I started to see this fail with trunk: ... (gdb) record instruction-history^M 1 0x00000000004004ab : call 0x4004b7 ^M 2 0x00000000004004c6 : mov $0x1,%eax^M 3 0x00000000004004cb : ret ^M (gdb) FAIL: gdb.btrace/tsx.exp: speculation indication ... This is due to an intel microcode update (1) that disables Intel TSX by default. Fix this by updating the pattern. Tested on x86_64-linux, with both gcc 7.5.0 and clang 12.0.1. [1] https://www.intel.com/content/www/us/en/support/articles/000059422/processors.html gdb/testsuite/ChangeLog: 2021-07-12 Tom de Vries PR testsuite/28057 * gdb.btrace/tsx.exp: Add pattern for system with tsx disabled in microcode. --- gdb/testsuite/gdb.btrace/tsx.exp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gdb/testsuite/gdb.btrace/tsx.exp b/gdb/testsuite/gdb.btrace/tsx.exp index ccde1ea807e..66f6305e50a 100644 --- a/gdb/testsuite/gdb.btrace/tsx.exp +++ b/gdb/testsuite/gdb.btrace/tsx.exp @@ -59,6 +59,11 @@ set abort_2 [multi_line \ "\[0-9\]*\t 0x\[0-9a-f\]+ :\tmov\[^\\\r\\\n\]*" \ "\[0-9\]*\t 0x\[0-9a-f\]+ :\tret\[^\\\r\\\n\]*" \ ] +set abort_3 \ + [multi_line \ + "$decimal\t $hex :\t\[^\\\r\\\n\]*" \ + "$decimal\t $hex :\tmov\[^\\\r\\\n\]*" \ + "$decimal\t $hex :\tret\[^\\\r\\\n\]*"] set test "speculation indication" gdb_test_multiple "record instruction-history" $test { @@ -68,6 +73,9 @@ gdb_test_multiple "record instruction-history" $test { -re "$abort_2.*$gdb_prompt $" { pass $test } + -re -wrap "$abort_3.*" { + pass $gdb_test_name + } -re "$begin_to_end.*$gdb_prompt $" { pass $test } -- 2.30.2