Skip to content

Commit

Permalink
ib
Browse files Browse the repository at this point in the history
  • Loading branch information
@clamchowder
clamchowder committed Oct 16, 2024
1 parent dd5b462 commit 88099d3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 113 deletions.
2 changes: 1 addition & 1 deletion AsmGen/AsmGen.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
109 changes: 1 addition & 108 deletions AsmGen/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,114 +16,7 @@ class Program
static void Main(string[] args)
{
List<IUarchTest> tests = new List<IUarchTest>();
<<<<<<< Updated upstream
tests.Add(new Zen3RobTest(4, 350, 1));
//tests.Add(new PhytiumRobTest(4, 256, 1));
tests.Add(new RobTest(4, 384, 1));
//tests.Add(new PhytiumRobTest(4, 256, 1));
tests.Add(new RobTest(4, 2048, 1));
tests.Add(new Zen4RobTest(4, 350, 1));
tests.Add(new MovElimRobTest(64, 384, 1));
tests.Add(new ZeroElimIntRf(64, 384, 1));
tests.Add(new Stq512Test(10, 100, 1));
tests.Add(new VecMovElimRobTest(64, 340, 1));
tests.Add(new ZeroElimVecRfTest(64, 340, 1));
tests.Add(new IntRfTest(4, 384, 1));
tests.Add(new FpRfTest(4, 384, 1));
tests.Add(new VecRfTest(4, 384, 1));
tests.Add(new Vec256RfTest(4, 384, 1));
tests.Add(new Vec512RfTest(32, 384, 1));
=======
tests.Add(new RobTest(4, 160, 1));
//tests.Add(new Zen3RobTest(4, 350, 1));
//tests.Add(new PhytiumRobTest(4, 256, 1));
tests.Add(new IntRfTest(4, 160, 1));
tests.Add(new FpRfTest(4, 160, 1));
tests.Add(new VecRfTest(4, 160, 1));
tests.Add(new Vec256RfTest(4, 160, 1));
tests.Add(new Vec512RfTest(4, 160, 1));
>>>>>>> Stashed changes
tests.Add(new AddSchedTest(4, 160, 1));
tests.Add(new MulSchedTest(4, 128, 1));
tests.Add(new Mul16SchedTest(4, 128, 1));
tests.Add(new Mul32SchedTest(4, 48, 1));
tests.Add(new FaddSchedTest(1, 256, 1));
tests.Add(new FmulSchedTest(1, 256, 1));
tests.Add(new Fadd256SchedTest(1, 128, 1));
tests.Add(new MixFaddFmulSchedTest(2, 128, 1));
tests.Add(new JumpSchedTest(4, 32, 1));
tests.Add(new FlagRfTest(4, 128, 1));
tests.Add(new MixIntFpRfTest(4, 512, 1));
tests.Add(new MixIntFp12RfTest(4, 256, 1));
tests.Add(new MixIntFp13RfTest(4, 256, 1));
tests.Add(new LoadSchedTest(4, 128, 1));
tests.Add(new StoreSchedTest(4, 128, 1));
tests.Add(new StoreDataSchedTest(2, 128, 1));
tests.Add(new LdqTest(4, 256, 1));
tests.Add(new StqTest(4, 160, 1));
tests.Add(new LdqStqTest(4, 128, 1));
tests.Add(new ReturnStackTest(1, 128, 1));
tests.Add(new MshrsTest(1, 12, 1));
tests.Add(new CvtSchedTest(1, 128, 1));
tests.Add(new RorSchedTest(1, 48, 1));
tests.Add(new MixMulSchedTest(1, 48, 1));
tests.Add(new TakenBranchBufferTest(1, 128, 1));
tests.Add(new BranchBufferTest(1, 128, 1));
tests.Add(new YmmStateIntRfTest(1, 64, 1));
tests.Add(new Add256RfTest(1, 256, 1));
tests.Add(new Add256SchedTest(1, 256, 1));
tests.Add(new Add512SchedTest(20, 256, 1));
tests.Add(new Add128SchedTest(1, 256, 1));
tests.Add(new BtbTest(4, BtbTest.BranchType.Unconditional));
tests.Add(new BtbTest(8, BtbTest.BranchType.Unconditional));
tests.Add(new BtbTest(16, BtbTest.BranchType.Unconditional));
tests.Add(new BtbTest(32, BtbTest.BranchType.Unconditional));
tests.Add(new BtbTest(64, BtbTest.BranchType.Unconditional));
tests.Add(new MixJmpMulSchedTest(2, 128, 1));
tests.Add(new MixMulRorSchedTest(2, 128, 1));
tests.Add(new BranchHistoryTest());
tests.Add(new IndirectBranchTest());
tests.Add(new MxcsrTest(1, 32, 1));
<<<<<<< Updated upstream
tests.Add(new MaskRfTest(1, 256, 1));
tests.Add(new NotIntRfTest(1, 450, 1));
tests.Add(new MovImmIntRfTest(1, 450, 1));
tests.Add(new FaddNsqTest(4, 135, 1));
=======
tests.Add(new MaskRfTest(1, 128, 1));
tests.Add(new NotIntRfTest(1, 128, 1));
tests.Add(new MovImmIntRfTest(1, 128, 1));
tests.Add(new FaddNsqTest(4, 120, 1));
>>>>>>> Stashed changes
tests.Add(new Add128NsqTest(4, 120, 1));
tests.Add(new LoadNsqTest(4, 50, 1));
tests.Add(new MixLoadStoreSchedTest(4, 120, 1));
tests.Add(new MixStoreSchedTest(4, 120, 1));
tests.Add(new VecStoreDataSchedTest(4, 80, 1));
tests.Add(new VecStoreDataNsqTest(4, 80, 1));
tests.Add(new StoreNsqTest(4, 38, 1));
tests.Add(new TakenJumpSchedTest(4, 60, 1));
tests.Add(new StoreHoistSchedTest(4, 90, 1));
tests.Add(new FpStoreDataNsqTest(4, 80, 1));
tests.Add(new FpStoreDataAddNsqTest(4, 80, 1));
tests.Add(new JumpNsqTest(4, 60, 1));
tests.Add(new BtsSchedTest(4, 80, 1));
tests.Add(new MixRorBtsSchedTest(4, 80, 1));
tests.Add(new LeaSchedTest(4, 80, 1));
tests.Add(new MixMulBtsSchedTest(4, 80, 1));
tests.Add(new MixLeaMulSchedTest(4, 80, 1));
tests.Add(new PdepSchedTest(4, 80, 1));
tests.Add(new PdepLeaSchedTest(4, 80, 1));
tests.Add(new MixPdepMulSchedTest(4, 80, 1));
tests.Add(new JumpAddSchedTest(4, 32, 1));
tests.Add(new LdmTest(4, 120, 1));
tests.Add(new NopLoopTest(512, 1));
tests.Add(new LoadDivSchedTest(4, 64, 1));
tests.Add(new LoadDivNsqTest(4, 64, 1));
tests.Add(new MixLoadStoreDivSchedTest(4, 64, 1));
tests.Add(new MmxRfTest(4, 128, 1));
tests.Add(new MixMmxSseRf(4, 128, 1));
tests.Add(new MxcsrFeTest(4, 128, 1));
tests.Add(new IndirectBranchTest(8));

StringBuilder cSourceFile = new StringBuilder();
StringBuilder vsCSourceFile = new StringBuilder();
Expand Down
8 changes: 4 additions & 4 deletions AsmGen/tests/IndirectBranchTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ public class IndirectBranchTest : IUarchTestParallelBuild
private int[] targetCounts;
private int globalHistoryAssistBits;

public IndirectBranchTest()
public IndirectBranchTest(int globalHistoryAssistBits)
{
Prefix = "indirectbranch";
Description = "Indirect branch prediction";
Prefix = "indirectbranch" + globalHistoryAssistBits;
Description = $"Indirect branch prediction, {globalHistoryAssistBits} assist bits";
FunctionDefinitionParameters = "uint64_t iterations, uint32_t **arr, uint32_t arrLen, uint64_t **scratch";
DivideTimeByCount = true;
branchCounts = new int[] { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 };
targetCounts = new int[] { 2, 4, 8, 12, 16, 24, 32, 48, 64, 96, 128 };
globalHistoryAssistBits = 4;
this.globalHistoryAssistBits = globalHistoryAssistBits;
//branchCounts = new int[] { 1, 2 };
//targetCounts = new int[] { 2, 3 };
}
Expand Down

0 comments on commit 88099d3

Please sign in to comment.