Skip to content

Commit

Permalink
Fixed culture issue, re-org benchmark directory
Browse files Browse the repository at this point in the history
  • Loading branch information
@badrishc
badrishc committed Oct 4, 2018
1 parent 611eb8d commit 6e6224a
Show file tree
Hide file tree
Showing 10 changed files with 103 additions and 21 deletions.
68 changes: 64 additions & 4 deletions cs/FASTER.sln
View file
Expand Up @@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 15.0.27004.2008
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FASTER.benchmark", "benchmark\FASTER.benchmark.csproj", "{33A732D1-2B58-4FEE-9696-B9483496229F}"
ProjectSection(ProjectDependencies) = postProject
{A6510B80-BD50-4C11-9712-64C3B3865AFF} = {A6510B80-BD50-4C11-9712-64C3B3865AFF}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FASTER.test", "test\FASTER.test.csproj", "{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}"
EndProject
Expand Down Expand Up @@ -35,56 +38,112 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FASTER.core", "src\core\FAS
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedSampleCore", "playground\ManagedSampleCore\ManagedSampleCore.csproj", "{C9391533-1F31-47F6-BE08-9642C95401A8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readtsc", "native\readtsc\readtsc.vcxproj", "{A6510B80-BD50-4C11-9712-64C3B3865AFF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{33A732D1-2B58-4FEE-9696-B9483496229F}.Debug|Any CPU.ActiveCfg = Debug|x64
{33A732D1-2B58-4FEE-9696-B9483496229F}.Debug|Any CPU.Build.0 = Debug|x64
{33A732D1-2B58-4FEE-9696-B9483496229F}.Debug|x64.ActiveCfg = Debug|x64
{33A732D1-2B58-4FEE-9696-B9483496229F}.Debug|x64.Build.0 = Debug|x64
{33A732D1-2B58-4FEE-9696-B9483496229F}.Release|Any CPU.ActiveCfg = Release|x64
{33A732D1-2B58-4FEE-9696-B9483496229F}.Release|Any CPU.Build.0 = Release|x64
{33A732D1-2B58-4FEE-9696-B9483496229F}.Release|x64.ActiveCfg = Release|x64
{33A732D1-2B58-4FEE-9696-B9483496229F}.Release|x64.Build.0 = Release|x64
{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}.Debug|x64.ActiveCfg = Debug|x64
{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}.Debug|x64.Build.0 = Debug|x64
{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}.Release|Any CPU.Build.0 = Release|Any CPU
{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}.Release|x64.ActiveCfg = Release|x64
{0DC7F5A2-E963-4E7F-BD37-6F7864B726F2}.Release|x64.Build.0 = Release|x64
{17BDD0A5-98E5-464A-8A00-050D9FF4C562}.Debug|Any CPU.ActiveCfg = Debug|x64
{17BDD0A5-98E5-464A-8A00-050D9FF4C562}.Debug|Any CPU.Build.0 = Debug|x64
{17BDD0A5-98E5-464A-8A00-050D9FF4C562}.Debug|x64.ActiveCfg = Debug|x64
{17BDD0A5-98E5-464A-8A00-050D9FF4C562}.Debug|x64.Build.0 = Debug|x64
{17BDD0A5-98E5-464A-8A00-050D9FF4C562}.Release|Any CPU.ActiveCfg = Release|x64
{17BDD0A5-98E5-464A-8A00-050D9FF4C562}.Release|Any CPU.Build.0 = Release|x64
{17BDD0A5-98E5-464A-8A00-050D9FF4C562}.Release|x64.ActiveCfg = Release|x64
{17BDD0A5-98E5-464A-8A00-050D9FF4C562}.Release|x64.Build.0 = Release|x64
{7DB87633-9CAB-4AE4-9ED0-AA6E77448486}.Debug|Any CPU.ActiveCfg = Debug|x64
{7DB87633-9CAB-4AE4-9ED0-AA6E77448486}.Debug|Any CPU.Build.0 = Debug|x64
{7DB87633-9CAB-4AE4-9ED0-AA6E77448486}.Debug|x64.ActiveCfg = Debug|x64
{7DB87633-9CAB-4AE4-9ED0-AA6E77448486}.Debug|x64.Build.0 = Debug|x64
{7DB87633-9CAB-4AE4-9ED0-AA6E77448486}.Release|Any CPU.ActiveCfg = Release|x64
{7DB87633-9CAB-4AE4-9ED0-AA6E77448486}.Release|Any CPU.Build.0 = Release|x64
{7DB87633-9CAB-4AE4-9ED0-AA6E77448486}.Release|x64.ActiveCfg = Release|x64
{7DB87633-9CAB-4AE4-9ED0-AA6E77448486}.Release|x64.Build.0 = Release|x64
{3E571C7C-59B5-485C-AC78-3F34D3511CD2}.Debug|Any CPU.ActiveCfg = Debug|x64
{3E571C7C-59B5-485C-AC78-3F34D3511CD2}.Debug|Any CPU.Build.0 = Debug|x64
{3E571C7C-59B5-485C-AC78-3F34D3511CD2}.Debug|x64.ActiveCfg = Debug|x64
{3E571C7C-59B5-485C-AC78-3F34D3511CD2}.Debug|x64.Build.0 = Debug|x64
{3E571C7C-59B5-485C-AC78-3F34D3511CD2}.Release|Any CPU.ActiveCfg = Release|x64
{3E571C7C-59B5-485C-AC78-3F34D3511CD2}.Release|Any CPU.Build.0 = Release|x64
{3E571C7C-59B5-485C-AC78-3F34D3511CD2}.Release|x64.ActiveCfg = Release|x64
{3E571C7C-59B5-485C-AC78-3F34D3511CD2}.Release|x64.Build.0 = Release|x64
{05D61B37-9714-4234-9961-384A63F7175E}.Debug|Any CPU.ActiveCfg = Debug|x64
{05D61B37-9714-4234-9961-384A63F7175E}.Debug|Any CPU.Build.0 = Debug|x64
{05D61B37-9714-4234-9961-384A63F7175E}.Debug|x64.ActiveCfg = Debug|x64
{05D61B37-9714-4234-9961-384A63F7175E}.Debug|x64.Build.0 = Debug|x64
{05D61B37-9714-4234-9961-384A63F7175E}.Release|Any CPU.ActiveCfg = Release|x64
{05D61B37-9714-4234-9961-384A63F7175E}.Release|Any CPU.Build.0 = Release|x64
{05D61B37-9714-4234-9961-384A63F7175E}.Release|x64.ActiveCfg = Release|x64
{05D61B37-9714-4234-9961-384A63F7175E}.Release|x64.Build.0 = Release|x64
{E1AC9797-ABE3-4881-A51B-37D8687AAE35}.Debug|Any CPU.ActiveCfg = Debug|x64
{E1AC9797-ABE3-4881-A51B-37D8687AAE35}.Debug|Any CPU.Build.0 = Debug|x64
{E1AC9797-ABE3-4881-A51B-37D8687AAE35}.Debug|x64.ActiveCfg = Debug|x64
{E1AC9797-ABE3-4881-A51B-37D8687AAE35}.Debug|x64.Build.0 = Debug|x64
{E1AC9797-ABE3-4881-A51B-37D8687AAE35}.Release|Any CPU.ActiveCfg = Release|x64
{E1AC9797-ABE3-4881-A51B-37D8687AAE35}.Release|Any CPU.Build.0 = Release|x64
{E1AC9797-ABE3-4881-A51B-37D8687AAE35}.Release|x64.ActiveCfg = Release|x64
{E1AC9797-ABE3-4881-A51B-37D8687AAE35}.Release|x64.Build.0 = Release|x64
{10FD4868-BB16-442B-B0AC-18AE278D9C60}.Debug|Any CPU.ActiveCfg = Debug|x64
{10FD4868-BB16-442B-B0AC-18AE278D9C60}.Debug|Any CPU.Build.0 = Debug|x64
{10FD4868-BB16-442B-B0AC-18AE278D9C60}.Debug|x64.ActiveCfg = Debug|x64
{10FD4868-BB16-442B-B0AC-18AE278D9C60}.Debug|x64.Build.0 = Debug|x64
{10FD4868-BB16-442B-B0AC-18AE278D9C60}.Release|Any CPU.ActiveCfg = Release|x64
{10FD4868-BB16-442B-B0AC-18AE278D9C60}.Release|Any CPU.Build.0 = Release|x64
{10FD4868-BB16-442B-B0AC-18AE278D9C60}.Release|x64.ActiveCfg = Release|x64
{10FD4868-BB16-442B-B0AC-18AE278D9C60}.Release|x64.Build.0 = Release|x64
{2D5F23F7-3184-43EC-A7F1-C924F7FEF786}.Debug|Any CPU.ActiveCfg = Debug|x64
{2D5F23F7-3184-43EC-A7F1-C924F7FEF786}.Debug|Any CPU.Build.0 = Debug|x64
{2D5F23F7-3184-43EC-A7F1-C924F7FEF786}.Debug|x64.ActiveCfg = Debug|x64
{2D5F23F7-3184-43EC-A7F1-C924F7FEF786}.Debug|x64.Build.0 = Debug|x64
{2D5F23F7-3184-43EC-A7F1-C924F7FEF786}.Release|Any CPU.ActiveCfg = Release|x64
{2D5F23F7-3184-43EC-A7F1-C924F7FEF786}.Release|Any CPU.Build.0 = Release|x64
{2D5F23F7-3184-43EC-A7F1-C924F7FEF786}.Release|x64.ActiveCfg = Release|x64
{2D5F23F7-3184-43EC-A7F1-C924F7FEF786}.Release|x64.Build.0 = Release|x64
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Debug|x64.ActiveCfg = Debug|Any CPU
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Debug|x64.Build.0 = Debug|Any CPU
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Release|x64.ActiveCfg = Release|Any CPU
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Release|x64.Build.0 = Release|Any CPU
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Debug|x64.ActiveCfg = Debug|x64
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Debug|x64.Build.0 = Debug|x64
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Release|Any CPU.Build.0 = Release|Any CPU
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Release|x64.ActiveCfg = Release|x64
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7}.Release|x64.Build.0 = Release|x64
{C9391533-1F31-47F6-BE08-9642C95401A8}.Debug|Any CPU.ActiveCfg = Debug|x64
{C9391533-1F31-47F6-BE08-9642C95401A8}.Debug|Any CPU.Build.0 = Debug|x64
{C9391533-1F31-47F6-BE08-9642C95401A8}.Debug|x64.ActiveCfg = Debug|x64
{C9391533-1F31-47F6-BE08-9642C95401A8}.Debug|x64.Build.0 = Debug|x64
{C9391533-1F31-47F6-BE08-9642C95401A8}.Release|Any CPU.ActiveCfg = Release|x64
{C9391533-1F31-47F6-BE08-9642C95401A8}.Release|Any CPU.Build.0 = Release|x64
{C9391533-1F31-47F6-BE08-9642C95401A8}.Release|x64.ActiveCfg = Release|x64
{C9391533-1F31-47F6-BE08-9642C95401A8}.Release|x64.Build.0 = Release|x64
{A6510B80-BD50-4C11-9712-64C3B3865AFF}.Debug|Any CPU.ActiveCfg = Release|Win32
{A6510B80-BD50-4C11-9712-64C3B3865AFF}.Debug|Any CPU.Build.0 = Release|Win32
{A6510B80-BD50-4C11-9712-64C3B3865AFF}.Debug|x64.ActiveCfg = Release|Win32
{A6510B80-BD50-4C11-9712-64C3B3865AFF}.Debug|x64.Build.0 = Release|Win32
{A6510B80-BD50-4C11-9712-64C3B3865AFF}.Release|Any CPU.ActiveCfg = Release|Win32
{A6510B80-BD50-4C11-9712-64C3B3865AFF}.Release|Any CPU.Build.0 = Release|Win32
{A6510B80-BD50-4C11-9712-64C3B3865AFF}.Release|x64.ActiveCfg = Release|Win32
{A6510B80-BD50-4C11-9712-64C3B3865AFF}.Release|x64.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -102,6 +161,7 @@ Global
{9531E3D2-217B-4446-98E8-E48F0FDD1452} = {28800357-C8CE-4CD0-A2AD-D4A910ABB496}
{F947BC6A-2943-4AC7-ACA7-F17351E25FE7} = {9531E3D2-217B-4446-98E8-E48F0FDD1452}
{C9391533-1F31-47F6-BE08-9642C95401A8} = {E6026D6A-01C5-4582-B2C1-64751490DABE}
{A6510B80-BD50-4C11-9712-64C3B3865AFF} = {CA6AB459-A31A-4C15-B1A6-A82C349B54B4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A0750637-2CCB-4139-B25E-F2CE740DCFAC}
Expand Down
11 changes: 1 addition & 10 deletions cs/benchmark/FASTER.benchmark.csproj
View file
Expand Up @@ -29,20 +29,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
<None Include="$(ProjectDir)nativebin\readtsc.dll" Link="readtsc.dll">
<None Include="$(ProjectDir)..\native\readtsc\Release\readtsc.dll" Link="readtsc.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<Compile Remove="nativebin\**" />
<Compile Remove="native\**" />
<EmbeddedResource Remove="nativebin\**" />
<EmbeddedResource Remove="native\**" />
<None Remove="nativebin\**" />
<None Remove="native\**" />
</ItemGroup>

<ItemGroup>
<None Include="App.config" />
</ItemGroup>
Expand Down
0 cs/benchmark/native/readtsc/readtsc.cpp → cs/native/readtsc/readtsc.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cs/benchmark/native/readtsc/readtsc.vcxproj → cs/native/readtsc/readtsc.vcxproj
View file
Expand Up @@ -35,7 +35,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\nativebin\</OutDir>
<OutDir>$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand Down
0 ...rk/native/readtsc/readtsc.vcxproj.filters → cs/native/readtsc/readtsc.vcxproj.filters
View file
File renamed without changes.
1 change: 0 additions & 1 deletion cs/src/core/Allocator/IAllocator.cs
View file
Expand Up @@ -10,6 +10,5 @@ public interface IAllocator : IDisposable
long Allocate(int numSlots);
long GetPhysicalAddress(long logicalAddress);
void CheckForAllocateComplete(ref long address);
void Dispose();
}
}
7 changes: 4 additions & 3 deletions cs/src/core/Codegen/FasterHashTableCompiler.cs
View file
Expand Up @@ -13,6 +13,7 @@
using System.Text;
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
using static FASTER.core.Roslyn.Helper;
using System.Globalization;

namespace FASTER.core.Roslyn
{
Expand Down Expand Up @@ -113,9 +114,9 @@ public void Run(bool persistGeneratedCode, bool optimizeCode, long LogTotalSizeB
compilation = compilation.ReplaceSyntaxTree(oldTree, newTree);
}

compilation = RoslynHelpers.ReplaceConstantValue(compilation, "LogMutableFraction", LogMutableFraction.ToString());
compilation = RoslynHelpers.ReplaceConstantValue(compilation, "LogTotalSizeBytes", LogTotalSizeBytes.ToString());
compilation = RoslynHelpers.ReplaceConstantValue(compilation, "LogPageSizeBits", LogPageSizeBits.ToString());
compilation = RoslynHelpers.ReplaceConstantValue(compilation, "LogMutableFraction", LogMutableFraction.ToString(CultureInfo.InvariantCulture));
compilation = RoslynHelpers.ReplaceConstantValue(compilation, "LogTotalSizeBytes", LogTotalSizeBytes.ToString(CultureInfo.InvariantCulture));
compilation = RoslynHelpers.ReplaceConstantValue(compilation, "LogPageSizeBits", LogPageSizeBits.ToString(CultureInfo.InvariantCulture));

#if TIMING
sw.Stop();
Expand Down
2 changes: 1 addition & 1 deletion cs/src/core/FASTER.core.csproj
View file
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
<Platforms>AnyCPU</Platforms>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>

<PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion cs/src/core/Index/FASTER/FASTERBase.cs
View file
Expand Up @@ -9,6 +9,7 @@
using System.Threading;
using System.Runtime.InteropServices;
using System.Diagnostics;
using System.Globalization;

namespace FASTER.core
{
Expand Down Expand Up @@ -714,7 +715,7 @@ protected virtual void _DumpDistribution(int version)
Console.WriteLine("Histogram of #entries per bucket: ");
for (int i=0; i<14; i++)
{
Console.WriteLine(i.ToString() + ": " + histogram[i].ToString());
Console.WriteLine(i.ToString() + ": " + histogram[i].ToString(CultureInfo.InvariantCulture));
}
}

Expand Down
30 changes: 30 additions & 0 deletions cs/test/FASTER.test.csproj
View file
Expand Up @@ -56,6 +56,36 @@
<PropertyGroup>
<AssemblyOriginatorKeyFile>../FASTER.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;METRICS</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWithMetrics|AnyCPU'">
<OutputPath>bin\ReleaseWithMetrics\</OutputPath>
<DefineConstants>TRACE;METRICS</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
Expand Down

0 comments on commit 6e6224a

Please sign in to comment.