Skip to content

Commit

Permalink
added option pages for ice-lake
Browse files Browse the repository at this point in the history
  • Loading branch information
@HJLebbink
HJLebbink committed Dec 25, 2017
1 parent 73672e7 commit 5ee33d9
Show file tree
Hide file tree
Showing 8 changed files with 206 additions and 7 deletions.
33 changes: 33 additions & 0 deletions VS/CSHARP/asm-dude-vsix/OptionsPage/AsmDudeOptionPageUI.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,24 +333,33 @@
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<TextBlock Text="SkyLake" Grid.Column="1" Grid.Row="0" TextWrapping="WrapWithOverflow" IsEnabled="False" HorizontalAlignment="Center" />
<TextBlock Text="Knights Landing" Grid.Column="2" Grid.Row="0" TextWrapping="WrapWithOverflow" HorizontalAlignment="Center" />
<TextBlock Text="Cannon-Lake" Grid.Column="3" Grid.Row="0" TextWrapping="WrapWithOverflow" HorizontalAlignment="Center"/>
<TextBlock Text="Knights Mill" Grid.Column="4" Grid.Row="0" TextWrapping="WrapWithOverflow" HorizontalAlignment="Center"/>
<TextBlock Text="Ice Lake" Grid.Column="5" Grid.Row="0" TextWrapping="WrapWithOverflow" HorizontalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_F_UI" Grid.Column="0" Grid.Row="1" Content="AVX512-F" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="3" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="4" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="5" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_CD_UI" Grid.Column="0" Grid.Row="2" Content="AVX512-CD" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="2" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="3" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="4" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="5" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_ER_UI" Grid.Column="0" Grid.Row="3" Content="AVX512-ER" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="2" Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
Expand All @@ -363,30 +372,54 @@
<CheckBox x:Name="UseArch_AVX512_BW_UI" Grid.Column="0" Grid.Row="5" Content="AVX512-BW" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="3" Grid.Row="5" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="5" Grid.Row="5" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_DQ_UI" Grid.Column="0" Grid.Row="6" Content="AVX512-DQ" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="3" Grid.Row="6" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="5" Grid.Row="6" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_VL_UI" Grid.Column="0" Grid.Row="7" Content="AVX512-VL" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="1" Grid.Row="7" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="3" Grid.Row="7" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="5" Grid.Row="7" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_IFMA_UI" Grid.Column="0" Grid.Row="8" Content="AVX512-IFMA" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="3" Grid.Row="8" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="5" Grid.Row="8" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_VBMI_UI" Grid.Column="0" Grid.Row="9" Content="AVX512-VBMI" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="3" Grid.Row="9" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="5" Grid.Row="9" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_VPOPCNTDQ_UI" Grid.Column="0" Grid.Row="10" Content="AVX512-VPOPCNTDQ" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="4" Grid.Row="10" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="X" Grid.Column="5" Grid.Row="10" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_4VNNIW_UI" Grid.Column="0" Grid.Row="11" Content="AVX512-4VNNIW" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="4" Grid.Row="11" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_4FMAPS_UI" Grid.Column="0" Grid.Row="12" Content="AVX512-4FMAPS" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="4" Grid.Row="12" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_VBMI2_UI" Grid.Column="0" Grid.Row="13" Content="AVX512-VBMI2" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="5" Grid.Row="13" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_VNNI_UI" Grid.Column="0" Grid.Row="14" Content="AVX512-VNNI" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="5" Grid.Row="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_BITALG_UI" Grid.Column="0" Grid.Row="15" Content="AVX512-BITALG" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="5" Grid.Row="15" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_GFNI_UI" Grid.Column="0" Grid.Row="16" Content="AVX512-GFNI" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="5" Grid.Row="16" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_VAES_UI" Grid.Column="0" Grid.Row="17" Content="AVX512-VAES" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="5" Grid.Row="17" HorizontalAlignment="Center" VerticalAlignment="Center"/>

<CheckBox x:Name="UseArch_AVX512_VPCLMULQDQ_UI" Grid.Column="0" Grid.Row="18" Content="AVX512-VPCLMULQDQ" VerticalAlignment="Center" Width="Auto" />
<TextBlock Text="X" Grid.Column="5" Grid.Row="18" HorizontalAlignment="Center" VerticalAlignment="Center"/>

</Grid>
</GroupBox>
</StackPanel>
Expand Down
32 changes: 32 additions & 0 deletions VS/CSHARP/asm-dude-vsix/OptionsPage/AsmDudeOptionPageUI.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,38 @@ public bool UseArch_AVX512_4FMAPS
set { this.UseArch_AVX512_4FMAPS_UI.IsChecked = value; }
}

public bool UseArch_AVX512_VBMI2
{
get { return this.UseArch_AVX512_VBMI2_UI.IsChecked ?? false; }
set { this.UseArch_AVX512_VBMI2_UI.IsChecked = value; }
}
public bool UseArch_AVX512_VNNI
{
get { return this.UseArch_AVX512_VNNI_UI.IsChecked ?? false; }
set { this.UseArch_AVX512_VNNI_UI.IsChecked = value; }
}
public bool UseArch_AVX512_BITALG
{
get { return this.UseArch_AVX512_BITALG_UI.IsChecked ?? false; }
set { this.UseArch_AVX512_BITALG_UI.IsChecked = value; }
}
public bool UseArch_AVX512_GFNI
{
get { return this.UseArch_AVX512_GFNI_UI.IsChecked ?? false; }
set { this.UseArch_AVX512_GFNI_UI.IsChecked = value; }
}
public bool UseArch_AVX512_VAES
{
get { return this.UseArch_AVX512_VAES_UI.IsChecked ?? false; }
set { this.UseArch_AVX512_VAES_UI.IsChecked = value; }
}
public bool UseArch_AVX512_VPCLMULQDQ
{
get { return this.UseArch_AVX512_VPCLMULQDQ_UI.IsChecked ?? false; }
set { this.UseArch_AVX512_VPCLMULQDQ_UI.IsChecked = value; }
}


public bool UseArch_X64
{
get { return this.UseArch_X64_UI.IsChecked ?? false; }
Expand Down
13 changes: 13 additions & 0 deletions VS/CSHARP/asm-dude-vsix/OptionsPage/AsmDudeOptionsPage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,19 @@ protected override void OnActivate(CancelEventArgs e)
this._asmDudeOptionsPageUI.UseArch_AVX512_4FMAPS = Settings.Default.ARCH_AVX512_4FMAPS;
this._asmDudeOptionsPageUI.UseArch_AVX512_4FMAPS_UI.ToolTip = MakeToolTip(Arch.AVX512_4FMAPS);

this._asmDudeOptionsPageUI.UseArch_AVX512_VBMI2 = Settings.Default.ARCH_AVX512_VBMI2;
this._asmDudeOptionsPageUI.UseArch_AVX512_VBMI2_UI.ToolTip = MakeToolTip(Arch.AVX512_VBMI2);
this._asmDudeOptionsPageUI.UseArch_AVX512_VNNI = Settings.Default.ARCH_AVX512_VNNI;
this._asmDudeOptionsPageUI.UseArch_AVX512_VNNI_UI.ToolTip = MakeToolTip(Arch.AVX512_VNNI);
this._asmDudeOptionsPageUI.UseArch_AVX512_BITALG = Settings.Default.ARCH_AVX512_BITALG;
this._asmDudeOptionsPageUI.UseArch_AVX512_BITALG_UI.ToolTip = MakeToolTip(Arch.AVX512_BITALG);
this._asmDudeOptionsPageUI.UseArch_AVX512_GFNI = Settings.Default.ARCH_AVX512_GFNI;
this._asmDudeOptionsPageUI.UseArch_AVX512_GFNI_UI.ToolTip = MakeToolTip(Arch.AVX512_GFNI);
this._asmDudeOptionsPageUI.UseArch_AVX512_VAES = Settings.Default.ARCH_AVX512_VAES;
this._asmDudeOptionsPageUI.UseArch_AVX512_VAES_UI.ToolTip = MakeToolTip(Arch.AVX512_VAES);
this._asmDudeOptionsPageUI.UseArch_AVX512_VPCLMULQDQ = Settings.Default.ARCH_AVX512_VPCLMULQDQ;
this._asmDudeOptionsPageUI.UseArch_AVX512_VPCLMULQDQ_UI.ToolTip = MakeToolTip(Arch.AVX512_VPCLMULQDQ);

this._asmDudeOptionsPageUI.UseArch_X64 = Settings.Default.ARCH_X64;
this._asmDudeOptionsPageUI.UseArch_X64_UI.ToolTip = MakeToolTip(Arch.X64);
this._asmDudeOptionsPageUI.UseArch_BMI1 = Settings.Default.ARCH_BMI1;
Expand Down
72 changes: 72 additions & 0 deletions VS/CSHARP/asm-dude-vsix/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions VS/CSHARP/asm-dude-vsix/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,5 +398,23 @@
<Setting Name="AsmSim_Show_Register_In_Register_Tooltip_Numeration" Type="System.String" Scope="User">
<Value Profile="(Default)">HEX</Value>
</Setting>
<Setting Name="ARCH_AVX512_VBMI2" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ARCH_AVX512_VNNI" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ARCH_AVX512_BITALG" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ARCH_AVX512_GFNI" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ARCH_AVX512_VAES" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ARCH_AVX512_VPCLMULQDQ" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>
7 changes: 7 additions & 0 deletions VS/CSHARP/asm-dude-vsix/Tools/AsmDudeToolsStatic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,13 @@ public static bool Is_Arch_Switched_On(Arch arch)
case Arch.AVX512_4VNNIW: return Settings.Default.ARCH_AVX512_4VNNIW;
case Arch.AVX512_4FMAPS: return Settings.Default.ARCH_AVX512_4FMAPS;

case Arch.AVX512_VBMI2: return Settings.Default.ARCH_AVX512_VBMI2;
case Arch.AVX512_VNNI: return Settings.Default.ARCH_AVX512_VNNI;
case Arch.AVX512_BITALG: return Settings.Default.ARCH_AVX512_BITALG;
case Arch.AVX512_GFNI: return Settings.Default.ARCH_AVX512_GFNI;
case Arch.AVX512_VAES: return Settings.Default.ARCH_AVX512_VAES;
case Arch.AVX512_VPCLMULQDQ: return Settings.Default.ARCH_AVX512_VPCLMULQDQ;

case Arch.X64: return Settings.Default.ARCH_X64;
case Arch.BMI1: return Settings.Default.ARCH_BMI1;
case Arch.BMI2: return Settings.Default.ARCH_BMI2;
Expand Down
27 changes: 24 additions & 3 deletions VS/CSHARP/asm-dude-vsix/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,36 @@
<setting name="AsmSim_Show_Register_In_Register_Tooltip" serializeAs="String">
<value>True</value>
</setting>
<setting name="AsmSim_Show_Register_In_Code_Completion_Numeration" serializeAs="String">
<setting name="AsmSim_Show_Register_In_Code_Completion_Numeration"
serializeAs="String">
<value>HEX</value>
</setting>
<setting name="AsmSim_Show_Register_In_Instruction_Tooltip_Numeration" serializeAs="String">
<setting name="AsmSim_Show_Register_In_Instruction_Tooltip_Numeration"
serializeAs="String">
<value>HEX</value>
</setting>
<setting name="AsmSim_Show_Register_In_Register_Tooltip_Numeration" serializeAs="String">
<setting name="AsmSim_Show_Register_In_Register_Tooltip_Numeration"
serializeAs="String">
<value>HEX</value>
</setting>
<setting name="ARCH_AVX512_VBMI2" serializeAs="String">
<value>False</value>
</setting>
<setting name="ARCH_AVX512_VNNI" serializeAs="String">
<value>False</value>
</setting>
<setting name="ARCH_AVX512_BITALG" serializeAs="String">
<value>False</value>
</setting>
<setting name="ARCH_AVX512_GFNI" serializeAs="String">
<value>False</value>
</setting>
<setting name="ARCH_AVX512_VAES" serializeAs="String">
<value>False</value>
</setting>
<setting name="ARCH_AVX512_VPCLMULQDQ" serializeAs="String">
<value>False</value>
</setting>
</AsmDude.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup>
Expand Down
Loading

0 comments on commit 5ee33d9

Please sign in to comment.