Cairo field size

app/CommonOptions.hs

@@ -11,6 +11,7 @@ import Data.List.NonEmpty qualified as NonEmpty
 import Juvix.Compiler.Core.Data.TransformationId.Parser qualified as Core
 import Juvix.Compiler.Reg.Data.TransformationId.Parser qualified as Reg
 import Juvix.Compiler.Tree.Data.TransformationId.Parser qualified as Tree
+import Juvix.Data.Field
 import Juvix.Data.FileExt
 import Juvix.Prelude
 import Options.Applicative
@@ -111,17 +112,21 @@ naturalNumberOpt = eitherReader aux
     aux :: String -> Either String Word
     aux s = maybe (Left $ s <> " is not a nonnegative number") Right (readMaybe s :: Maybe Word)
 
-numberInOpt :: [Natural] -> ReadM Natural
-numberInOpt lst = eitherReader aux
+fieldSizeOpt :: ReadM (Maybe Natural)
+fieldSizeOpt = eitherReader aux
   where
-    aux :: String -> Either String Natural
-    aux s =
-      either Left checkInList $
-        maybe (Left $ s <> " is not a nonnegative number") Right (readMaybe s :: Maybe Natural)
+    aux :: String -> Either String (Maybe Natural)
+    aux s = case s of
+      "cairo" -> Right $ Just cairoFieldSize
+      "small" -> Right $ Just defaultFieldSize
+      _ ->
+        mapRight Just $
+          either Left checkAllowed $
+            maybe (Left $ s <> " is not a valid field size") Right (readMaybe s :: Maybe Natural)
 
-    checkInList :: Natural -> Either String Natural
-    checkInList n
-      | n `elem` lst = Right n
+    checkAllowed :: Natural -> Either String Natural
+    checkAllowed n
+      | n `elem` allowedFieldSizes = Right n
       | otherwise = Left $ Prelude.show n <> " is not a recognized field size"
 
 extCompleter :: FileExt -> Completer

app/GlobalOptions.hs

@@ -24,7 +24,7 @@ data GlobalOptions = GlobalOptions
     _globalNoCoverage :: Bool,
     _globalNoStdlib :: Bool,
     _globalUnrollLimit :: Int,
-    _globalFieldSize :: Natural,
+    _globalFieldSize :: Maybe Natural,
     _globalOffline :: Bool
   }
   deriving stock (Eq, Show)
@@ -48,7 +48,7 @@ instance CanonicalProjection GlobalOptions Core.CoreOptions where
     Core.CoreOptions
       { Core._optCheckCoverage = not _globalNoCoverage,
         Core._optUnrollLimit = _globalUnrollLimit,
-        Core._optFieldSize = _globalFieldSize,
+        Core._optFieldSize = fromMaybe defaultFieldSize _globalFieldSize,
         Core._optOptimizationLevel = defaultOptimizationLevel,
         Core._optInliningDepth = defaultInliningDepth
       }
@@ -66,7 +66,7 @@ defaultGlobalOptions =
       _globalNoCoverage = False,
       _globalNoStdlib = False,
       _globalUnrollLimit = defaultUnrollLimit,
-      _globalFieldSize = defaultFieldSize,
+      _globalFieldSize = Nothing,
       _globalOffline = False
     }
 
@@ -118,10 +118,10 @@ parseGlobalFlags = do
       )
   _globalFieldSize <-
     option
-      (numberInOpt allowedFieldSizes)
+      fieldSizeOpt
       ( long "field-size"
-          <> value defaultFieldSize
-          <> help ("Field type size (default: " <> show defaultFieldSize <> ")")
+          <> value Nothing
+          <> help "Field type size [cairo,small,11]"
       )
   _globalUnrollLimit <-
     option
@@ -174,7 +174,7 @@ entryPointFromGlobalOptions root mainFile opts = do
         _entryPointGenericOptions = project opts,
         _entryPointBuildDir = maybe (def ^. entryPointBuildDir) (CustomBuildDir . Abs) mabsBuildDir,
         _entryPointOffline = opts ^. globalOffline,
-        _entryPointFieldSize = opts ^. globalFieldSize
+        _entryPointFieldSize = fromMaybe defaultFieldSize $ opts ^. globalFieldSize
       }
   where
     optBuildDir :: Maybe (Prepath Dir)
@@ -197,7 +197,7 @@ entryPointFromGlobalOptionsNoFile root opts = do
         _entryPointGenericOptions = project opts,
         _entryPointBuildDir = maybe (def ^. entryPointBuildDir) (CustomBuildDir . Abs) mabsBuildDir,
         _entryPointOffline = opts ^. globalOffline,
-        _entryPointFieldSize = opts ^. globalFieldSize
+        _entryPointFieldSize = fromMaybe defaultFieldSize $ opts ^. globalFieldSize
       }
   where
     optBuildDir :: Maybe (Prepath Dir)

src/Juvix/Compiler/Casm/Interpreter.hs

@@ -30,7 +30,7 @@ runCode (LabelInfo labelInfo) instrs0 = runST goCode
     initialMemSize = 1024
 
     fsize :: Natural
-    fsize = maximum allowedFieldSizes
+    fsize = cairoFieldSize
 
     goCode :: ST s FField
     goCode = do

src/Juvix/Compiler/Core/Evaluator.hs

@@ -30,7 +30,7 @@ defaultEvalOptions =
     { _evalOptionsNormalize = False,
       _evalOptionsNoFailure = False,
       _evalOptionsSilent = False,
-      _evalOptionsFieldSize = maximum allowedFieldSizes
+      _evalOptionsFieldSize = defaultFieldSize
     }
 
 data EvalError = EvalError

src/Juvix/Compiler/Core/Options.hs

@@ -1,6 +1,7 @@
 module Juvix.Compiler.Core.Options where
 
 import Juvix.Compiler.Pipeline.EntryPoint
+import Juvix.Data.Field
 import Juvix.Prelude
 
 data CoreOptions = CoreOptions

src/Juvix/Compiler/Core/Translation/FromSource.hs

@@ -618,7 +618,7 @@ exprConstString = P.try $ do
 exprConstField :: ParsecS r Node
 exprConstField = P.try $ do
   (n, i) <- field
-  return $ mkConstant (Info.singleton (LocationInfo i)) (ConstField (fieldFromInteger (maximum allowedFieldSizes) n))
+  return $ mkConstant (Info.singleton (LocationInfo i)) (ConstField (fieldFromInteger defaultFieldSize n))
 
 exprUniverse :: ParsecS r Type
 exprUniverse = do

src/Juvix/Compiler/Pipeline/EntryPoint.hs

@@ -86,6 +86,3 @@ defaultOptimizationLevel = 1
 
 defaultInliningDepth :: Int
 defaultInliningDepth = 3
-
-defaultFieldSize :: Natural
-defaultFieldSize = maximum allowedFieldSizes

src/Juvix/Compiler/Tree/Data/InfoTable/Base.hs

@@ -73,7 +73,7 @@ emptyInfoTable =
       _infoConstrs = mempty,
       _infoInductives = mempty,
       _infoMainFunction = Nothing,
-      _infoFieldSize = maximum allowedFieldSizes
+      _infoFieldSize = defaultFieldSize
     }
 
 lookupFunInfo :: InfoTable' a e -> Symbol -> FunctionInfo' a e

src/Juvix/Compiler/Tree/Translation/FromSource/Base.hs

@@ -323,7 +323,7 @@ constant = fieldValue <|> integerValue <|> boolValue <|> stringValue <|> unitVal
 fieldValue :: ParsecS r Constant
 fieldValue = P.try $ do
   (i, _) <- field
-  return $ ConstField (fieldFromInteger (maximum allowedFieldSizes) i)
+  return $ ConstField (fieldFromInteger defaultFieldSize i)
 
 integerValue :: ParsecS r Constant
 integerValue = do

src/Juvix/Data/Field.hs

@@ -15,8 +15,14 @@ newtype FField = FField
 
 makeLenses ''FField
 
+cairoFieldSize :: Natural
+cairoFieldSize = 3618502788666131213697322783095070105623107215331596699973092056135872020481
+
+defaultFieldSize :: Natural
+defaultFieldSize = 2147483647
+
 allowedFieldSizes :: [Natural]
-allowedFieldSizes = [11, 2147483647]
+allowedFieldSizes = [11, defaultFieldSize, cairoFieldSize]
 
 instance Serialize FField where
   put f = S.put (fieldSize f, fieldToInteger f)

tests/Casm/positive/out/test014.out

@@ -1 +1 @@
-214748354
+2532951952066291849588125948166549073936175050732117689981164439295110414326