From 05724fe0cc112511b9e6e8222e373454981c2583 Mon Sep 17 00:00:00 2001
From: Russel Arbore <russel.jma@gmail.com>
Date: Wed, 8 Jan 2025 18:14:12 -0800
Subject: [PATCH] Make GVN dedup scalar constants
---
hercules_opt/src/gvn.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hercules_opt/src/gvn.rs b/hercules_opt/src/gvn.rs
index 5f7138e5..69ed8e4a 100644
--- a/hercules_opt/src/gvn.rs
+++ b/hercules_opt/src/gvn.rs
@@ -31,7 +31,10 @@ pub fn gvn(editor: &mut FunctionEditor, gvn_constants_and_clones: bool) {
// Also, don't GVN constants and clones if indicated to not do so.
if *number == work
|| (!gvn_constants_and_clones
- && (editor.func().nodes[work.idx()].is_constant()
+ && (editor.func().nodes[work.idx()]
+ .try_constant()
+ .map(|cons_id| !editor.get_constant(cons_id).is_scalar())
+ .unwrap_or(false)
|| editor.func().nodes[work.idx()]
.try_write()
.map(|(_, _, indices)| indices.is_empty())
--
GitLab