tiled fma is ok, mat mul is now available again

This commit is contained in:
Youmu Liu
2026-01-12 15:09:39 +08:00
parent b8bf1e9f08
commit ad3b2212fa
6 changed files with 172 additions and 119 deletions
+103
View File
@@ -0,0 +1,103 @@
//-----------------------------------------------------------------------
// -----------------------------------------------------------------------
// file="MatrixTest"
// Project: StgSharp
// AuthorGroup: Nitload
// Copyright (c) Nitload. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
using Microsoft.CodeAnalysis.CSharp.Syntax;
using StgSharp.HighPerformance.Memory;
using StgSharp.Mathematics.Numeric;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text;
using System.Threading.Tasks;
using T = double;
namespace StgSharp
{
internal static partial class Program
{
private static int sideLength = 400;
internal static unsafe void TestMatrix(
)
{
// TestRender();
/**/
HybridLayerSegregatedFitAllocator hlsf;
unchecked {
hlsf = new((nuint)(4 * (ulong)1024 * 1024 * 1024));
}
Matrix<T> m = Matrix<T>.Create(sideLength, sideLength, MatrixLayout.DenseRectangle,
hlsf);
MatrixCompute.Fill(m, 1.0f);
Matrix<T> n = Matrix<T>.Create(sideLength, sideLength, MatrixLayout.DenseRectangle,
hlsf);
MatrixCompute.Fill(n, 1.0f);
Matrix<T> p = Matrix<T>.Create(sideLength, sideLength, MatrixLayout.DenseRectangle,
hlsf);
MatrixCompute.Fill(p, 0.0f);
/*
for (int j = 0; j < 20; j++)
{
for (int k = 0; k < 10; k++) {
Console.Write($"{m[j, k]:0.0E+00}\t");
}
Console.WriteLine();
}
/**/
Console.WriteLine("===================================================");
MatrixCompute.Mul(n, m, p);
/**/
for (int i = 0; i < 400; i++)
{
if (i % 4 == 0) {
Console.WriteLine();
}
for (int j = 0; j < 30; j++)
{
string extra = j % 4 == 3 ? " " : " ";
T value = p[j, i];
// value = T.Abs(value) < 1e-6 ? 0 : value;
// Console.Write($"{p.GetElementOffset(j,i)}{extra}");
Console.Write($"{value:000}{extra}");
}
Console.WriteLine();
}
Console.WriteLine("===================================================");
/**/
}
}
}
+1 -51
View File
@@ -49,58 +49,8 @@ namespace StgSharp
.UseModule<NumericalModule>()
.UseModule<GraphicModule>()
.InitializeModule();
TestMatrix();
// TestRender();
/**/
HybridLayerSegregatedFitAllocator hlsf;
unchecked {
hlsf = new((nuint)(4 * (ulong)1024 * 1024 * 1024));
}
Matrix<double> m = Matrix<double>.Create(40, 40, MatrixLayout.DenseRectangle, hlsf);
MatrixCompute.Fill(m, 1.0f);
Matrix<double> n = Matrix<double>.Create(40, 40, MatrixLayout.DenseRectangle, hlsf);
MatrixCompute.Fill(n, 1.0f);
Matrix<double> p = Matrix<double>.Create(40, 40, MatrixLayout.DenseRectangle, hlsf);
MatrixCompute.Fill(p, 0.0f);
/*
for (int j = 0; j < 20; j++)
{
for (int k = 0; k < 10; k++) {
Console.Write($"{m[j, k]:0.0E+00}\t");
}
Console.WriteLine();
}
/**/
Console.WriteLine("===================================================");
MatrixCompute.Mul(n, m, p);
/**/
for (int i = 0; i < 40; i++)
{
if (i % 4 == 0) {
Console.WriteLine();
}
for (int j = 0; j < 40; j++)
{
string extra = j % 4 == 3 ? " " : ",";
double value = p[i, j];
value = double.Abs(value) < 1e-6 ? 0 : value;
Console.Write($"{value:0E+0}{extra}");
}
Console.WriteLine();
}
Console.WriteLine("===================================================");
double *buffer = (double*)p.Buffer;
for (int i = 0; i < 40; i++)
{
for (int j = 0; j < 40; j++) {
Console.Write($"{buffer[i * 40 + j]:0.0E0} ");
}
Console.WriteLine();
}
/**/
// --- Logarithmic time sequence test: print seconds at each emitted span ---
}