Skip to content

Commit 8d80a45

Browse files
committed
Revert "[lldb][AArch64] Invalidate SVG prior to reconfiguring ZA regdef (#66768)"
This reverts commit f2c09e5, due to compilation failures on buildbots.
1 parent 0e27cbe commit 8d80a45

File tree

3 files changed

+0
-18
lines changed

3 files changed

+0
-18
lines changed

lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -374,17 +374,6 @@ void RegisterInfoPOSIX_arm64::AddRegSetSME() {
374374
std::make_pair(sme_regnum, m_dynamic_reg_infos.size());
375375
m_dynamic_reg_sets.push_back(g_reg_set_sme_arm64);
376376
m_dynamic_reg_sets.back().registers = m_sme_regnum_collection.data();
377-
378-
// When vg is written during streaming mode, svg will also change, as vg and
379-
// svg in this state are both showing the streaming vector length.
380-
// We model this as vg invalidating svg. In non-streaming mode this doesn't
381-
// happen but to keep things simple we will invalidate svg anyway.
382-
//
383-
// This must be added now, rather than when vg is defined because SME is a
384-
// dynamic set that may or may not be present.
385-
static const uint32_t vg_invalidates[] = {sme_regnum + 1 /*svg*/,
386-
LLDB_INVALID_REGNUM};
387-
m_dynamic_reg_infos[GetRegNumSMESVG()].invalidate_regs = vg_invalidates;
388377
}
389378

390379
uint32_t RegisterInfoPOSIX_arm64::ConfigureVectorLengthSVE(uint32_t sve_vq) {

lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -783,11 +783,6 @@ void GDBRemoteRegisterContext::AArch64Reconfigure() {
783783
std::optional<uint64_t> svg_reg_value;
784784
const RegisterInfo *svg_reg_info = m_reg_info_sp->GetRegisterInfo("svg");
785785
if (svg_reg_info) {
786-
// When vg is written it is automatically made invalid. Writing vg will also
787-
// change svg if we're in streaming mode but it will not be made invalid
788-
// so do this manually so the following read gets the latest svg value.
789-
SetRegisterIsValid(svg_reg_info, false);
790-
791786
uint32_t svg_reg_num = svg_reg_info->kinds[eRegisterKindLLDB];
792787
uint64_t reg_value = ReadRegisterAsUnsigned(svg_reg_num, fail_value);
793788
if (reg_value != fail_value && reg_value <= 32)

lldb/test/API/commands/register/register/aarch64_za_register/za_dynamic_resize/TestZAThreadedDynamic.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,11 @@ def za_test_impl(self, enable_za):
125125
self.runCmd("thread select %d" % (idx + 1))
126126
self.check_za_register(4, 2)
127127
self.runCmd("register write vg 2")
128-
self.check_disabled_za_register(2)
129128

130129
elif stopped_at_line_number == thY_break_line1:
131130
self.runCmd("thread select %d" % (idx + 1))
132131
self.check_za_register(2, 3)
133132
self.runCmd("register write vg 4")
134-
self.check_disabled_za_register(4)
135133

136134
self.runCmd("thread continue 2")
137135
self.runCmd("thread continue 3")

0 commit comments

Comments
 (0)