Merge pull request #4 from l-adic/circuit-builder-more-types

Implement Sharing and separate out language lib

Author: martyall

Diff for: arithmetic-circuits.cabal

@@ -47,13 +47,11 @@ common deps
     , filepath        >=1.4.2
     , finite-typelits >=0.1.0
     , galois-field    >=2.0.0
-    , microlens
     , process
     , propagators
     , protolude       >=0.2
     , semirings       >=0.7
     , text            >=1.2.3
-    , vector-sized
     , wl-pprint-text  >=1.2.0
 
 library
@@ -65,18 +63,39 @@ library
     Circuit.Dataflow
     Circuit.Solver
     Circuit.Dot
-    Circuit.Expr
-    Circuit.Lang
     R1CS
     Fresh
 
   other-modules:      Paths_arithmetic_circuits
-  hs-source-dirs:     src
+  hs-source-dirs:     circuit/src
 
   ghc-options:        -freverse-errors -O2 -Wall
 
   default-language:   GHC2021
 
+library language
+  import: deps, extensions, warnings
+  visibility: public
+  exposed-modules:
+    Circuit.Language.Compile
+    Circuit.Language.Expr
+    Circuit.Language.TExpr
+    Circuit.Language.DSL
+    Circuit.Language
+
+  hs-source-dirs:     language/src
+  build-depends:
+      arithmetic-circuits
+    , hashable
+    , microlens
+    , vector
+    , vector-sized
+
+  ghc-options:        -freverse-errors -O2 -Wall
+
+  default-language:   GHC2021
+
+
 library circom-compat
   import: deps, extensions, warnings
   visibility: public
@@ -97,12 +116,47 @@ library circom-compat
 
   default-language:   GHC2021
 
+test-suite language-tests
+  import: deps, extensions
+  type:               exitcode-stdio-1.0
+  main-is:            Main.hs
+
+  other-modules:
+    Test.Circuit.Expr
+    Test.Circuit.Sudoku
+    Test.Circuit.Lang
+
+  hs-source-dirs:     language/test
+
+  ghc-options:        -freverse-errors -O2 -Wall -main-is Main
+  build-depends:
+      arithmetic-circuits
+    , arithmetic-circuits:language
+    , array
+    , distributive 
+    , fin
+    , quickcheck-instances  >=0.3
+    , QuickCheck
+    , random
+    , hspec
+    , tasty                 >=1.2
+    , tasty-hunit           >=0.10
+    , tasty-hspec
+    , tasty-quickcheck      >=0.10
+    , vec
+
+  build-tool-depends: tasty-discover:tasty-discover >=4.2
+
+  default-language:   GHC2021
+
+
 executable factors
   import:           warnings, extensions, deps
   main-is:          Main.hs
   build-depends:
       binary
     , arithmetic-circuits
+    , arithmetic-circuits:language
     , arithmetic-circuits:circom-compat
 
   hs-source-dirs:   circom-compat/app
@@ -117,20 +171,14 @@ test-suite circuit-tests
     Paths_arithmetic_circuits
     Test.Circuit.Affine
     Test.Circuit.Arithmetic
-    Test.Circuit.Expr
     Test.Circuit.R1CS
-    Test.Circuit.Sudoku
-    Test.Circuit.Lang
 
-  hs-source-dirs:     test
+  hs-source-dirs:     circuit/test
 
   ghc-options:        -freverse-errors -O2 -Wall -main-is Main
   build-depends:
       arithmetic-circuits
     , array
-    , distributive 
-    , fin
-    , integer-logarithms
     , quickcheck-instances  >=0.3
     , QuickCheck
     , random
@@ -139,7 +187,6 @@ test-suite circuit-tests
     , tasty-hunit           >=0.10
     , tasty-hspec
     , tasty-quickcheck      >=0.10
-    , vec
 
   build-tool-depends: tasty-discover:tasty-discover >=4.2
 

Diff for: circom-compat/app/Main.hs

@@ -4,8 +4,9 @@
 module Main where
 
 import Circuit
+import Circuit.Language
 import Data.Binary (encodeFile)
-import Data.Field.Galois (GaloisField, Prime)
+import Data.Field.Galois (Prime)
 import Data.Map qualified as Map
 import Data.Set qualified as Set
 import Protolude
@@ -14,7 +15,7 @@ import R1CS.Circom (r1csToCircomR1CS, witnessToCircomWitness)
 
 main :: IO ()
 main = do
-  let BuilderState {..} = snd $ runCircuitBuilder $ program @Fr
+  let BuilderState {..} = snd $ runCircuitBuilder program
       publicInputs = Map.fromList $ zip (Set.toAscList $ cvPublicInputs bsVars) [6]
       privateInputs = Map.fromList $ zip (Set.toAscList $ cvPrivateInputs bsVars) [2, 3]
       inputs = publicInputs <> privateInputs
@@ -25,7 +26,7 @@ main = do
 
 type Fr = Prime 21888242871839275222246405745257275088548364400416034343698204186575808495617
 
-program :: (GaloisField f) => ExprM f Wire
+program :: ExprM Fr Wire
 program = do
   n <- deref <$> fieldInput Public "n"
   a <- deref <$> fieldInput Private "a"

Diff for: src/Circuit.hs renamed to circuit/src/Circuit.hs

@@ -1,8 +1,6 @@
 module Circuit
   ( module Circuit.Affine,
     module Circuit.Arithmetic,
-    module Circuit.Lang,
-    module Circuit.Expr,
     module Circuit.Dataflow,
     module Circuit.Solver,
   )
@@ -11,6 +9,4 @@ where
 import Circuit.Affine
 import Circuit.Arithmetic
 import Circuit.Dataflow
-import Circuit.Expr
-import Circuit.Lang
 import Circuit.Solver

Diff for: src/Circuit/Affine.hs renamed to circuit/src/Circuit/Affine.hs

@@ -55,12 +55,15 @@ instance FromJSON Wire
 
 instance ToJSON Wire
 
+instance Hashable Wire where
+  hashWithSalt s w = s `hashWithSalt` (0 :: Int) `hashWithSalt` (wireName w)
+
 instance Pretty Wire where
   pretty (InputWire label t v) =
     let a = case t of
           Public -> "pub"
           Private -> "priv"
-     in text (a <> "_input_") <> pretty v <> "_{\"" <> pretty label <> "\"}"
+     in text (a <> "_input_") <> pretty v <> "_" <> pretty label
   pretty (IntermediateWire v) = text "imm_" <> pretty v
   pretty (OutputWire v) = text "output_" <> pretty v
 

Diff for: src/Circuit/Arithmetic.hs renamed to circuit/src/Circuit/Arithmetic.hs

@@ -6,10 +6,9 @@ module Test.Circuit.Arithmetic where
 import Circuit.Affine
 import Circuit.Arithmetic
 import Circuit.Solver
-import Data.Field.Galois (Prime, char, fromP)
+import Data.Field.Galois (Prime, fromP)
 import Data.List ((\\))
 import Data.Map qualified as Map
-import Math.NumberTheory.Logarithms (naturalLog2)
 import Protolude
 import Test.Tasty.QuickCheck
 
@@ -181,7 +180,7 @@ prop_division (a, b) =
    in Map.lookup 3 solution == Just (a / b)
 
 nBits :: Int
-nBits = 1 + naturalLog2 (char (1 :: Fr))
+nBits = 254
 
 prop_bitSummingForward :: Fr -> Bool
 prop_bitSummingForward a =

Diff for: src/Circuit/Dataflow.hs renamed to circuit/src/Circuit/Dataflow.hs

@@ -0,0 +1,10 @@
+module Circuit.Language
+  ( module Circuit.Language.Compile,
+    module Circuit.Language.DSL,
+    module Circuit.Language.TExpr,
+  )
+where
+
+import Circuit.Language.Compile
+import Circuit.Language.DSL
+import Circuit.Language.TExpr