Attempt to rewrite unnecessary constructor applications in the plugin (…

…#5649) * Attempt to rewrite opaque constructor applications in the plugin * Update plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs Co-authored-by: Michael Peyton Jones <[email protected]> * Update plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs Co-authored-by: Michael Peyton Jones <[email protected]> * Rewrite all unnecessary constructor applications * cabal files --------- Co-authored-by: Michael Peyton Jones <[email protected]>
IntersectMBO · Nov 23, 2023 · 98c5167 · 98c5167
1 parent e974b48
commit 98c5167
Show file tree

Hide file tree

Showing 53 changed files with 225 additions and 120 deletions.
diff --git a/...emantics/9.2/0003040402030103010203030303000200000104030002040304020400000102.eval.golden b/...emantics/9.2/0003040402030103010203030303000200000104030002040304020400000102.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1428979902
-| mem: 5367574})
+({cpu: 1428703902
+| mem: 5366374})
diff --git a/...emantics/9.2/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden b/...emantics/9.2/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1438491380
-| mem: 5012365})
+({cpu: 1438353380
+| mem: 5011765})
diff --git a/...emantics/9.2/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden b/...emantics/9.2/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1417412598
-| mem: 5183617})
+({cpu: 1417136598
+| mem: 5182417})
diff --git a/...emantics/9.2/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden b/...emantics/9.2/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1544798878
-| mem: 5626951})
+({cpu: 1544660878
+| mem: 5626351})
diff --git a/...emantics/9.2/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden b/...emantics/9.2/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1909249237
-| mem: 6938218})
+({cpu: 1908697237
+| mem: 6935818})
diff --git a/...emantics/9.2/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden b/...emantics/9.2/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1005387218
-| mem: 3676461})
+({cpu: 1005249218
+| mem: 3675861})
diff --git a/...emantics/9.2/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden b/...emantics/9.2/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1600079695
-| mem: 5950644})
+({cpu: 1599665695
+| mem: 5948844})
diff --git a/...emantics/9.2/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden b/...emantics/9.2/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1008646729
-| mem: 3687894})
+({cpu: 1008508729
+| mem: 3687294})
diff --git a/...emantics/9.2/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden b/...emantics/9.2/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1421735134
-| mem: 5238131})
+({cpu: 1421597134
+| mem: 5237531})
diff --git a/...emantics/9.2/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden b/...emantics/9.2/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1431481884
-| mem: 5121021})
+({cpu: 1431343884
+| mem: 5120421})
diff --git a/...emantics/9.2/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden b/...emantics/9.2/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1459372109
-| mem: 5284223})
+({cpu: 1459234109
+| mem: 5283623})
diff --git a/...emantics/9.2/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden b/...emantics/9.2/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 698186900
-| mem: 2541975})
+({cpu: 698048900
+| mem: 2541375})
diff --git a/...emantics/9.2/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden b/...emantics/9.2/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1019039066
-| mem: 3760674})
+({cpu: 1018901066
+| mem: 3760074})
diff --git a/...emantics/9.2/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden b/...emantics/9.2/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1439049563
-| mem: 5281393})
+({cpu: 1438911563
+| mem: 5280793})
diff --git a/...emantics/9.2/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden b/...emantics/9.2/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1448656659
-| mem: 5039771})
+({cpu: 1448380659
+| mem: 5038571})
diff --git a/...emantics/9.2/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden b/...emantics/9.2/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1885978449
-| mem: 6837860})
+({cpu: 1885426449
+| mem: 6835460})
diff --git a/...emantics/9.2/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden b/...emantics/9.2/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1423763870
-| mem: 5261307})
+({cpu: 1423625870
+| mem: 5260707})
diff --git a/...emantics/9.2/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden b/...emantics/9.2/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1269996610
-| mem: 4667910})
+({cpu: 1269720610
+| mem: 4666710})
diff --git a/plutus-benchmark/marlowe/test/semantics/9.2/semantics.size.golden b/plutus-benchmark/marlowe/test/semantics/9.2/semantics.size.golden
@@ -1 +1 @@
-11593
+11589
diff --git a/...emantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.eval.golden b/...emantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1431072902
-| mem: 5376674})
+({cpu: 1430796902
+| mem: 5375474})
diff --git a/...emantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden b/...emantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1438514380
-| mem: 5012465})
+({cpu: 1438376380
+| mem: 5011865})
diff --git a/...emantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden b/...emantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1420011598
-| mem: 5194917})
+({cpu: 1419735598
+| mem: 5193717})
diff --git a/...emantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden b/...emantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1547742878
-| mem: 5639751})
+({cpu: 1547604878
+| mem: 5639151})
diff --git a/...emantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden b/...emantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1912515237
-| mem: 6952418})
+({cpu: 1911963237
+| mem: 6950018})
diff --git a/...emantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden b/...emantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1007365218
-| mem: 3685061})
+({cpu: 1007227218
+| mem: 3684461})
diff --git a/...emantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden b/...emantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1601482695
-| mem: 5956744})
+({cpu: 1601068695
+| mem: 5954944})
diff --git a/...emantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden b/...emantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1008094729
-| mem: 3685494})
+({cpu: 1007956729
+| mem: 3684894})
diff --git a/...emantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden b/...emantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1423483134
-| mem: 5245731})
+({cpu: 1423345134
+| mem: 5245131})
diff --git a/...emantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden b/...emantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1431826884
-| mem: 5122521})
+({cpu: 1431688884
+| mem: 5121921})
diff --git a/...emantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden b/...emantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1464202109
-| mem: 5305223})
+({cpu: 1464064109
+| mem: 5304623})
diff --git a/...emantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden b/...emantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 697243900
-| mem: 2537875})
+({cpu: 697105900
+| mem: 2537275})
diff --git a/...emantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden b/...emantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1018165066
-| mem: 3756874})
+({cpu: 1018027066
+| mem: 3756274})
diff --git a/...emantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden b/...emantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1440797563
-| mem: 5288993})
+({cpu: 1440659563
+| mem: 5288393})
diff --git a/...emantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden b/...emantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1448679659
-| mem: 5039871})
+({cpu: 1448403659
+| mem: 5038671})
diff --git a/...emantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden b/...emantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1889566449
-| mem: 6853460})
+({cpu: 1889014449
+| mem: 6851060})
diff --git a/...emantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden b/...emantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1425511870
-| mem: 5268907})
+({cpu: 1425373870
+| mem: 5268307})
diff --git a/...emantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden b/...emantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 1272963610
-| mem: 4680810})
+({cpu: 1272687610
+| mem: 4679610})
diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden b/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden
@@ -1 +1 @@
-11652
+11648
diff --git a/plutus-benchmark/nofib/test/9.2/queens4-bt.pir.golden b/plutus-benchmark/nofib/test/9.2/queens4-bt.pir.golden
@@ -612,9 +612,7 @@
                                                             (/\dead ->
                                                                Bool_match
                                                                  (ds
-                                                                    (`Cons=`
-                                                                       var'
-                                                                       val')
+                                                                    ds
                                                                     (`Cons=`
                                                                        var
                                                                        val))

diff --git a/plutus-benchmark/nofib/test/9.2/queens4-bt.size.golden b/plutus-benchmark/nofib/test/9.2/queens4-bt.size.golden
@@ -1 +1 @@
-1860
+1858
diff --git a/plutus-benchmark/nofib/test/9.2/queens5-fc.eval.golden b/plutus-benchmark/nofib/test/9.2/queens5-fc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 282792904581
-| mem: 1078786366})
+({cpu: 282717464581
+| mem: 1078458366})
diff --git a/plutus-benchmark/nofib/test/9.2/queens5-fc.pir.golden b/plutus-benchmark/nofib/test/9.2/queens5-fc.pir.golden
@@ -612,9 +612,7 @@
                                                             (/\dead ->
                                                                Bool_match
                                                                  (ds
-                                                                    (`Cons=`
-                                                                       var'
-                                                                       val')
+                                                                    ds
                                                                     (`Cons=`
                                                                        var
                                                                        val))

diff --git a/plutus-benchmark/nofib/test/9.2/queens5-fc.size.golden b/plutus-benchmark/nofib/test/9.2/queens5-fc.size.golden
@@ -1 +1 @@
-1860
+1858
diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.pir.golden b/plutus-benchmark/nofib/test/9.6/queens4-bt.pir.golden
@@ -660,9 +660,7 @@
                                                             (/\dead ->
                                                                Bool_match
                                                                  (ds
-                                                                    (`Cons=`
-                                                                       var'
-                                                                       val')
+                                                                    ds
                                                                     (`Cons=`
                                                                        var
                                                                        val))

diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.size.golden b/plutus-benchmark/nofib/test/9.6/queens4-bt.size.golden
@@ -1 +1 @@
-1931
+1929
diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.eval.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.eval.golden
@@ -1,2 +1,2 @@
-({cpu: 284790983581
-| mem: 1087473666})
+({cpu: 284715543581
+| mem: 1087145666})
diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.pir.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.pir.golden
@@ -660,9 +660,7 @@
                                                             (/\dead ->
                                                                Bool_match
                                                                  (ds
-                                                                    (`Cons=`
-                                                                       var'
-                                                                       val')
+                                                                    ds
                                                                     (`Cons=`
                                                                        var
                                                                        val))

diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.size.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.size.golden
@@ -1 +1 @@
-1931
+1929
diff --git a/plutus-core/plutus-core.cabal b/plutus-core/plutus-core.cabal
@@ -744,8 +744,8 @@ library plutus-core-testlib
 
 -- This wraps up the use of the certifier library
 -- so we can present a consistent inteface whether we
--- are building with it or not. If we aren't building 
--- with it, we present a conservative stub implementation 
+-- are building with it or not. If we aren't building
+-- with it, we present a conservative stub implementation
 -- that just always says everything is fine.
 library plutus-ir-cert
   import:           lang

diff --git a/plutus-tx-plugin/changelog.d/20231121_151437_unsafeFixIO_opaque.md b/plutus-tx-plugin/changelog.d/20231121_151437_unsafeFixIO_opaque.md
@@ -0,0 +1,4 @@
+### Changed
+
+- Updated the Plutus Tx compiler to make the "Unsupported feature: Cannot case on a value on type"
+  error happen less often (if not eliminating it entirely).
diff --git a/plutus-tx-plugin/plutus-tx-plugin.cabal b/plutus-tx-plugin/plutus-tx-plugin.cabal
@@ -89,6 +89,7 @@ library
     , PyF                                   >=0.11.1.0
     , template-haskell
     , text
+    , uniplate
 
   if flag(use-ghc-stub)
     build-depends: plutus-ghc-stub