Skip to content

Commit

Permalink
Remove plutus-ghc-stub (#6514)
Browse files Browse the repository at this point in the history
  • Loading branch information
zliu41 authored Sep 25, 2024
1 parent 24e3cfc commit 148c05d
Show file tree
Hide file tree
Showing 25 changed files with 1 addition and 1,040 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# linguist gets confused by PIR files, and thinks they make up a lot of our source!
*.pir linguist-detectable=false
stubs/plutus-ghc-stub/** linguist-vendored=true
# Large HTML files inside 'notes' are dominating our repoistory language
# estimate.
notes/**/*.html linguist-documentation
Expand Down
6 changes: 0 additions & 6 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ packages: cardano-constitution
plutus-tx-plugin
plutus-tx-test-util
prettyprinter-configurable
stubs/plutus-ghc-stub
doc/docusaurus/docusaurus-examples.cabal

-- We never, ever, want this.
Expand Down Expand Up @@ -60,11 +59,6 @@ if impl(ghc < 9.0) || os(windows)
allow-older: plutus-cert:base

if os(windows)
-- When cross compiling we don't have a `ghc` package, so use
-- the `plutus-ghc-stub` package instead.
package plutus-tx-plugin
flags: +use-ghc-stub

-- Exclude tests that use `doctest`. They will not work for
-- cross compilation and `cabal` will not be able to make a plan.
package prettyprinter-configurable
Expand Down
18 changes: 1 addition & 17 deletions plutus-tx-plugin/plutus-tx-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ common os-support
if (impl(ghcjs) || os(windows))
buildable: False

flag use-ghc-stub
description: Use the `plutus-ghc-stub` package instead of `ghc`.
default: False
manual: True

library
import: lang, ghc-version-support, os-support
hs-source-dirs: src
Expand Down Expand Up @@ -85,6 +80,7 @@ library
, either
, extra
, flat ^>=0.6
, ghc
, lens
, mtl
, plutus-core:{plutus-core, plutus-ir} ^>=1.34
Expand All @@ -94,14 +90,6 @@ library
, text
, uniplate

if flag(use-ghc-stub)
build-depends: plutus-ghc-stub
ghc-options:
-Wno-unused-packages -Wno-unused-imports -Wno-overlapping-patterns

else
build-depends: ghc

executable gen-plugin-opts-doc
import: lang, ghc-version-support, os-support
main-is: GeneratePluginOptionsDoc.hs
Expand All @@ -121,10 +109,6 @@ executable gen-plugin-opts-doc

test-suite plutus-tx-plugin-tests
import: lang, ghc-version-support, os-support

if flag(use-ghc-stub)
buildable: False

type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Spec.hs
Expand Down
31 changes: 0 additions & 31 deletions stubs/plutus-ghc-stub/LICENSE

This file was deleted.

13 changes: 0 additions & 13 deletions stubs/plutus-ghc-stub/NOTICE

This file was deleted.

6 changes: 0 additions & 6 deletions stubs/plutus-ghc-stub/README.md

This file was deleted.

52 changes: 0 additions & 52 deletions stubs/plutus-ghc-stub/plutus-ghc-stub.cabal

This file was deleted.

1 change: 0 additions & 1 deletion stubs/plutus-ghc-stub/src/Class.hs

This file was deleted.

3 changes: 0 additions & 3 deletions stubs/plutus-ghc-stub/src/CoreSyn.hs

This file was deleted.

1 change: 0 additions & 1 deletion stubs/plutus-ghc-stub/src/FV.hs

This file was deleted.

3 changes: 0 additions & 3 deletions stubs/plutus-ghc-stub/src/FamInstEnv.hs

This file was deleted.

1 change: 0 additions & 1 deletion stubs/plutus-ghc-stub/src/Finder.hs

This file was deleted.

7 changes: 0 additions & 7 deletions stubs/plutus-ghc-stub/src/GhcPlugins.hs

This file was deleted.

2 changes: 0 additions & 2 deletions stubs/plutus-ghc-stub/src/Kind.hs

This file was deleted.

2 changes: 0 additions & 2 deletions stubs/plutus-ghc-stub/src/LoadIface.hs

This file was deleted.

1 change: 0 additions & 1 deletion stubs/plutus-ghc-stub/src/MkId.hs

This file was deleted.

5 changes: 0 additions & 5 deletions stubs/plutus-ghc-stub/src/OccName.hs

This file was deleted.

2 changes: 0 additions & 2 deletions stubs/plutus-ghc-stub/src/Panic.hs

This file was deleted.

176 changes: 0 additions & 176 deletions stubs/plutus-ghc-stub/src/Plugins.hs

This file was deleted.

Loading

1 comment on commit 148c05d

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Plutus Benchmarks'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 1.05.

Benchmark suite Current: 148c05d Previous: 24e3cfc Ratio
validation-future-pay-out-2 767.5 μs 687.8 μs 1.12
validation-future-pay-out-3 774.1 μs 529 μs 1.46
validation-future-pay-out-4 1153 μs 798.8 μs 1.44
validation-future-settle-early-1 353.8 μs 255 μs 1.39
validation-future-settle-early-2 768.3 μs 531.9 μs 1.44
validation-future-settle-early-3 768.4 μs 532.1 μs 1.44
validation-future-settle-early-4 864.5 μs 605.2 μs 1.43
validation-game-sm-success_1-1 554 μs 386.1 μs 1.43
validation-multisig-sm-2 546.8 μs 515.4 μs 1.06
validation-multisig-sm-3 559.8 μs 388.6 μs 1.44
validation-multisig-sm-4 560 μs 388.8 μs 1.44
validation-multisig-sm-5 788 μs 557.4 μs 1.41
validation-multisig-sm-6 463.9 μs 394.1 μs 1.18
validation-multisig-sm-7 413.2 μs 385.3 μs 1.07
validation-ping-pong_2-1 270.2 μs 200.7 μs 1.35
validation-prism-1 213.6 μs 167.7 μs 1.27
validation-pubkey-1 168.4 μs 142.1 μs 1.19
validation-stablecoin_1-1 1285 μs 916.6 μs 1.40
validation-stablecoin_1-2 224.3 μs 196.6 μs 1.14
validation-stablecoin_1-4 245.9 μs 207 μs 1.19
validation-stablecoin_1-5 1900 μs 1339 μs 1.42
validation-stablecoin_1-6 307.1 μs 256.5 μs 1.20
validation-decode-auction_1-1 267.5 μs 240.7 μs 1.11
validation-decode-auction_1-2 729.6 μs 543.4 μs 1.34
validation-decode-auction_1-3 736.3 μs 576.7 μs 1.28
validation-decode-auction_1-4 267.8 μs 192.5 μs 1.39
validation-decode-auction_2-1 264.4 μs 192.2 μs 1.38
validation-decode-auction_2-2 735.8 μs 527 μs 1.40
validation-decode-auction_2-3 733.3 μs 528.1 μs 1.39
validation-decode-auction_2-4 734 μs 528.5 μs 1.39
validation-decode-auction_2-5 268.3 μs 192.8 μs 1.39
validation-decode-crowdfunding-success-1 262.2 μs 234.9 μs 1.12
validation-decode-crowdfunding-success-2 323.7 μs 235.3 μs 1.38
validation-decode-crowdfunding-success-3 327.6 μs 235.4 μs 1.39
validation-decode-currency-1 321.8 μs 230.5 μs 1.40
validation-decode-escrow-redeem_1-1 438.3 μs 313.4 μs 1.40
validation-decode-escrow-redeem_1-2 438.1 μs 367.1 μs 1.19
validation-decode-game-sm-success_2-5 716 μs 560.4 μs 1.28
validation-decode-multisig-sm-10 796.2 μs 756.6 μs 1.05
validation-decode-ping-pong-1 665.1 μs 540.2 μs 1.23
validation-decode-vesting-1 438.9 μs 375.9 μs 1.17
nofib-clausify/formula1 4314 μs 3395 μs 1.27
nofib-clausify/formula4 36170 μs 25710 μs 1.41
nofib-clausify/formula5 76990 μs 54310 μs 1.42
nofib-knights/4x4 24720 μs 17450 μs 1.42
nofib-knights/6x6 64870.00000000001 μs 45840 μs 1.42
nofib-primetest/50digits 142400 μs 129900 μs 1.10
nofib-queens4x4/bt 7527 μs 5317 μs 1.42
nofib-queens4x4/bm 7964 μs 6690 μs 1.19
nofib-queens4x4/bjbt1 7390 μs 6461 μs 1.14
nofib-queens4x4/bjbt2 8570 μs 6051 μs 1.42
marlowe-semantics/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7 431 μs 395.7 μs 1.09
marlowe-semantics/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d 1406 μs 995.6 μs 1.41
marlowe-semantics/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220 8173 μs 5829 μs 1.40
marlowe-semantics/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263 513.4 μs 363.2 μs 1.41
marlowe-semantics/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882 430.1 μs 305.6 μs 1.41
marlowe-semantics/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3 808.3 μs 573.3 μs 1.41
marlowe-semantics/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5 2554 μs 1814 μs 1.41
marlowe-semantics/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c 1333 μs 944.3 μs 1.41
marlowe-semantics/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695 1128 μs 795.4 μs 1.42
marlowe-semantics/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1 1093 μs 775 μs 1.41
marlowe-semantics/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a 1650 μs 1162 μs 1.42
marlowe-semantics/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c 1466 μs 1037 μs 1.41
marlowe-semantics/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d 379.6 μs 304.6 μs 1.25
marlowe-semantics/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0 947.3 μs 672.8 μs 1.41
marlowe-semantics/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4 1066 μs 751.7 μs 1.42
marlowe-semantics/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79 6380 μs 4563 μs 1.40
marlowe-role-payout/031d56d71454e2c4216ffaa275c4a8b3eb631109559d0e56f44ea8489f57ba97 298.7 μs 255.2 μs 1.17
marlowe-role-payout/bd460b7549b70c52e37b312a4242041eac18fe4a266f018bcea0c78a9085a271 278.1 μs 234.4 μs 1.19
marlowe-role-payout/bd79f4a84db23b7c4cd219d498bd581e085cbc3437957e74a8862281a700700b 280.8 μs 198.2 μs 1.42
marlowe-role-payout/c11490431db3a92efdda70933ba411a0423935e73a75c856e326dbcf6672f3bf 246.1 μs 174.7 μs 1.41
marlowe-role-payout/c4d4c88c5fe378a25a034025994a0d0b1642f10c8e6e513f872327fa895bfc7e 257.7 μs 182.1 μs 1.42
marlowe-role-payout/c78eeba7681d2ab51b4758efa4c812cc041928837c6e7563d8283cce67ce2e02 259.5 μs 183.5 μs 1.41
marlowe-role-payout/c99ecc2146ce2066ba6dffc734923264f8794815acbc2ec74c2c2c42ba272e4d 302.4 μs 213.1 μs 1.42
marlowe-role-payout/caa409c40e39aed9b0f59214b4baa178c375526dea6026b4552b88d2cc729716 231.8 μs 164.1 μs 1.41
marlowe-role-payout/cb2ab8e22d1f64e8d204dece092e90e9bf1fa8b2a6e9cba5012dbe4978065832 247.4 μs 174.8 μs 1.42
marlowe-role-payout/cc1e82927f6c65b3e912200ae30588793d2066e1d4a6627c21955944ac9bd528 277.3 μs 195.8 μs 1.42
marlowe-role-payout/d5cda74eb0947e025e02fb8ed365df39d0a43e4b42cd3573ac2d8fcb29115997 271.5 μs 191.6 μs 1.42
marlowe-role-payout/d6bc8ac4155e22300085784148bbc9d9bbfea896e1009dd396610a90e3943032 278.1 μs 196.6 μs 1.41
marlowe-role-payout/da353bf9219801fa1bf703fc161497570954e9af7e10ffe95c911a9ef97e77bd 248.9 μs 177 μs 1.41
marlowe-role-payout/dc45c5f1b700b1334db99f50823321daaef0e6925b9b2fabbc9df7cde65af62e 252.4 μs 178.7 μs 1.41
marlowe-role-payout/df487b2fd5c1583fa33644423849bc1ab5f02f37edc0c235f34ef01cb12604f6 257 μs 181.5 μs 1.42
marlowe-role-payout/eabeeae18131af89fa57936c0e9eb8d2c7adba534f7e1a517d75410028fa0d6c 246.2 μs 174 μs 1.41
marlowe-role-payout/ec4712ee820eb959a43ebedfab6735f2325fa52994747526ffd2a4f4f84dd58e 278.2 μs 196.6 μs 1.42
marlowe-role-payout/ee3962fbd7373360f46decef3c9bda536a0b1daf6cda3b8a4bcfd6deeb5b4c53 281.2 μs 198.9 μs 1.41
marlowe-role-payout/f1a1e6a487f91feca5606f72bbb1e948c71abf043c6a0ea83bfea9ec6a0f08d8 241.8 μs 170.9 μs 1.41
marlowe-role-payout/f2932e4ca4bbb94b0a9ffbe95fcb7bd5639d9751d75d56d5e14efa5bbed981df 239.3 μs 169.7 μs 1.41
marlowe-role-payout/f53e8cafe26647ccce51e4c31db13608aea1f39034c0f52dee2e5634ef66e747 264.2 μs 187 μs 1.41
marlowe-role-payout/f7275afb60e33a550df13a132102e7e925dd28965a4efbe510a89b077ff9417f 245.3 μs 173.9 μs 1.41
marlowe-role-payout/fc8c5f45ffcdb024c21e0f34b22c23de8045a94d5e1a5bda1555c45ddb059f82 256.9 μs 181.3 μs 1.42
marlowe-role-payout/ff38b1ec89952d0247630f107a90cbbeb92ecbfcd19b284f60255718e4ec7548 294.1 μs 207.6 μs 1.42

This comment was automatically generated by workflow using github-action-benchmark.

CC: @IntersectMBO/plutus-core

Please sign in to comment.