GitHub/haskell-wasm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement more simd conversions

Browse Source
This commit is contained in:
Ilya Rezvov
2025-01-13 20:32:47 -07:00
parent 727fc8694b
commit 8742966ece
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Language/Wasm/Interpreter.hs
+13 -1
View File
@@ -69,7 +69,7 @@ import Language.Wasm.FloatUtils (
wordToFloat, wordToFloat,
floatToWord, floatToWord,
wordToDouble, wordToDouble,
doubleToWord doubleToWord, doubleToFloat
) )
import Debug.Trace as Debug import Debug.Trace as Debug
@@ -2128,6 +2128,9 @@ eval budget store inst FunctionInstance { funcType, moduleInstance, code = Funct
return $ Done ctx { stack = VF64 (realToFrac v) : rest } return $ Done ctx { stack = VF64 (realToFrac v) : rest }
step ctx@EvalCtx{ stack = (VI64 v:rest) } (FConvertIU BS64 BS64) = step ctx@EvalCtx{ stack = (VI64 v:rest) } (FConvertIU BS64 BS64) =
return $ Done ctx { stack = VF64 (realToFrac v) : rest } return $ Done ctx { stack = VF64 (realToFrac v) : rest }
step ctx@EvalCtx{ stack = (VV128 v:rest) } (FConvertIU (BS128 F32x4) (BS128 I32x4)) =
let r = realToFrac . ByteArray.indexByteArray @Word32 v <$> [0..3] in
return $ Done ctx { stack = VV128 (ByteArray.byteArrayFromList @Float r) : rest }
step ctx@EvalCtx{ stack = (VI32 v:rest) } (FConvertIS BS32 BS32) = step ctx@EvalCtx{ stack = (VI32 v:rest) } (FConvertIS BS32 BS32) =
return $ Done ctx { stack = VF32 (realToFrac $ asInt32 v) : rest } return $ Done ctx { stack = VF32 (realToFrac $ asInt32 v) : rest }
step ctx@EvalCtx{ stack = (VI64 v:rest) } (FConvertIS BS32 BS64) = step ctx@EvalCtx{ stack = (VI64 v:rest) } (FConvertIS BS32 BS64) =
@@ -2136,6 +2139,9 @@ eval budget store inst FunctionInstance { funcType, moduleInstance, code = Funct
return $ Done ctx { stack = VF64 (realToFrac $ asInt32 v) : rest } return $ Done ctx { stack = VF64 (realToFrac $ asInt32 v) : rest }
step ctx@EvalCtx{ stack = (VI64 v:rest) } (FConvertIS BS64 BS64) = step ctx@EvalCtx{ stack = (VI64 v:rest) } (FConvertIS BS64 BS64) =
return $ Done ctx { stack = VF64 (realToFrac $ asInt64 v) : rest } return $ Done ctx { stack = VF64 (realToFrac $ asInt64 v) : rest }
step ctx@EvalCtx{ stack = (VV128 v:rest) } (FConvertIS (BS128 F32x4) (BS128 I32x4)) =
let r = realToFrac . asInt32 . ByteArray.indexByteArray @Word32 v <$> [0..3] in
return $ Done ctx { stack = VV128 (ByteArray.byteArrayFromList @Float r) : rest }
step ctx@EvalCtx{ stack = (VF64 v:rest) } F32DemoteF64 = step ctx@EvalCtx{ stack = (VF64 v:rest) } F32DemoteF64 =
return $ Done ctx { stack = VF32 (realToFrac v) : rest } return $ Done ctx { stack = VF32 (realToFrac v) : rest }
step ctx@EvalCtx{ stack = (VF32 v:rest) } F64PromoteF32 = step ctx@EvalCtx{ stack = (VF32 v:rest) } F64PromoteF32 =
@@ -2294,6 +2300,12 @@ eval budget store inst FunctionInstance { funcType, moduleInstance, code = Funct
_ -> error "impossible due to validation" _ -> error "impossible due to validation"
in in
return $ Done ctx { stack = VV128 (ByteArray.byteArrayFromList @Word32 r) : rest } return $ Done ctx { stack = VV128 (ByteArray.byteArrayFromList @Word32 r) : rest }
step ctx@EvalCtx{ stack = (VV128 v:rest) } F64x2PromoteLowF32x4 =
let r = realToFrac . ByteArray.indexByteArray @Float v <$> [0..1] in
return $ Done ctx { stack = VV128 (ByteArray.byteArrayFromList @Double r) : rest }
step ctx@EvalCtx{ stack = (VV128 v:rest) } F32x4DemoteF64x2Zero =
let r = doubleToFloat . ByteArray.indexByteArray v <$> [0..1] in
return $ Done ctx { stack = VV128 (ByteArray.byteArrayFromList $ r ++ [0, 0]) : rest }
step EvalCtx{ stack } instr = error $ "Error during evaluation of instruction: " ++ show instr ++ ". Stack " ++ show stack step EvalCtx{ stack } instr = error $ "Error during evaluation of instruction: " ++ show instr ++ ". Stack " ++ show stack
eval _ _ _ HostInstance { funcType, hostCode } args = Just <$> hostCode args eval _ _ _ HostInstance { funcType, hostCode } args = Just <$> hostCode args
tests/Test.hs
+1 -1
View File
@@ -20,7 +20,7 @@ main = do
filter (List.isPrefixOf "simd") . filter (List.isPrefixOf "simd") .
filter (List.isSuffixOf ".wast") filter (List.isSuffixOf ".wast")
<$> Directory.listDirectory "tests/spec" <$> Directory.listDirectory "tests/spec"
-- let files = ["simd_i32x4_trunc_sat_f64x2.wast"] let files = ["simd_conversions.wast"]
scriptTestCases <- (`mapM` files) $ \file -> do scriptTestCases <- (`mapM` files) $ \file -> do
test <- LBS.readFile ("tests/spec/" ++ file) test <- LBS.readFile ("tests/spec/" ++ file)
return $ testCase file $ do return $ testCase file $ do