Lombiq · Piedone · Sep 26, 2023 · Jul 2, 2023 · Jul 21, 2023 · Jul 23, 2023
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,10 @@
 <Project>
   <Import Project="tools/Lombiq.Analyzers/Lombiq.Analyzers/Build.props" />
 
+  <PropertyGroup>
+    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(IsPackable)' != 'false'">
     <Authors>Lombiq Technologies</Authors>
     <Copyright>Copyright © 2017, Lombiq Technologies Ltd.</Copyright>

diff --git a/NuGetTest/Hast.NuGet.Console/Hast.NuGet.Console.csproj b/NuGetTest/Hast.NuGet.Console/Hast.NuGet.Console.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Hast.Algorithms" Version="2.1.1-alpha.0.hast-321" />
-    <PackageReference Include="Hast.Layer" Version="2.1.1-alpha.0.hast-321" />
+    <PackageReference Include="Hast.Algorithms" Version="2.1.1-alpha.0.hast-314" />
+    <PackageReference Include="Hast.Layer" Version="2.1.1-alpha.0.hast-314" />
     <PackageReference Include="Hast.Vitis.HardwareFramework" Version="1.2.0" />
   </ItemGroup>
 

diff --git a/NuGetTest/Hast.NuGet.Console/Program.cs b/NuGetTest/Hast.NuGet.Console/Program.cs
@@ -12,6 +12,16 @@
 
 configuration.VhdlTransformerConfiguration().VhdlGenerationConfiguration = VhdlGenerationConfiguration.Debug;
 
+// To cross-compile, first run without any arguments (this will throw an exception during execution), then copy the
+// HardwareFramework directory to the remote device and pass the binary's path as the argument, e.g.:
+// dotnet Hast.NuGet.Console.dll HardwareFramework/bin/*.azure.xclbin
+var binaryPath = Environment.GetCommandLineArgs().FirstOrDefault(item => item.EndsWithOrdinalIgnoreCase(".xclbin"));
+if (File.Exists(binaryPath))
+{
+    configuration.SingleBinaryPath = binaryPath;
+    Console.WriteLine($"Using the existing binary file \"{binaryPath}\". Compilation will be skipped.");
+}
+
 hastlayer.ExecutedOnHardware += (_, e) =>
     Console.WriteLine(
         StringHelper.ConcatenateConvertiblesInvariant(

diff --git a/src/HardwareFrameworks/Vitis b/src/HardwareFrameworks/Vitis
diff --git a/src/Hastlayer/Hast.Layer/Hast.Layer.csproj b/src/Hastlayer/Hast.Layer/Hast.Layer.csproj
@@ -13,7 +13,7 @@
       <PackageCopyToOutput>true</PackageCopyToOutput>
     </Content>
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\Hast.Synthesis\Hast.Synthesis.csproj" />
     <ProjectReference Include="..\Hast.Transformer\Hast.Transformer.csproj" />
@@ -23,14 +23,13 @@
     <ProjectReference Include="..\Hast.Xilinx\Hast.Xilinx.csproj" />
     <ProjectReference Include="..\Hast.Communication\Hast.Communication.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="NLog" Version="4.7.15" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
   </ItemGroup>

diff --git a/src/Hastlayer/Hast.Vitis/Docs/Nimbix.md b/src/Hastlayer/Hast.Vitis/Docs/Nimbix.md
@@ -1,7 +1,7 @@
 # Nimbix usage
 
 
-> ⚠️ The instructions below are outdated, as the mentioned Alveo trial is no longer available. Some of the names have changed since Nibix has been acquired by Atos, and they only seem to offer enterprise solutions now. The rest of the document is retained in case it may be a useful reference for anyone who wants to use their services with Hastlayer.
+> ⚠️ The instructions below are outdated, as the mentioned Alveo trial is no longer available. Some of the names have changed since Nimbix has been acquired by Atos, and they only seem to offer enterprise solutions now. The rest of the document is retained in case it may be a useful reference for anyone who wants to use their services with Hastlayer.
 
 
 To run a Hastlayer applications on the [Nimbix HPC cloud](https://www.nimbix.net/), a compute instance must be launched, the dependencies installed and the host & device applications uploaded. You can find the necessary instructions here.

diff --git a/src/Hastlayer/Hast.Vitis/Readme.md b/src/Hastlayer/Hast.Vitis/Readme.md
@@ -18,8 +18,8 @@ Note that the SH scripts in this project should use LF line endings! You'll get
 
 Even after everything is installed, you have to make sure that the executing user's environment variables are correctly set by sourcing the setup scripts [as described in the documentation](https://docs.xilinx.com/r/en-US/ug1400-vitis-embedded/Setting-Up-the-Environment-to-Run-the-Vitis-Software-Platform). You can add these commands into the `~/.bashrc` file to avoid having to type them every time. If running from the cloud, like Nimbix, this is probably handled automatically.
 
-For Azure-specific instructions see [the Azure NP docs](Docs/AzureReadme.md).
-For Nimbix-specific instructions see [the Nimbix docs](Docs/Nimbix.md).
+- For Azure-specific instructions see [the Azure NP docs](Docs/AzureReadme.md).
+- For Nimbix-specific instructions see [the Nimbix docs](Docs/Nimbix.md).
 
 
 ## Cross Compilation

diff --git a/src/Hastlayer/Hast.Vitis/Services/VitisHardwareImplementationComposerBuildProvider.cs b/src/Hastlayer/Hast.Vitis/Services/VitisHardwareImplementationComposerBuildProvider.cs
@@ -364,7 +364,7 @@ private async Task BuildKernelAsync(
             var emConfigExecutable = await GetExecutablePathAsync("emconfigutil");
             var emConfigArguments = new[] { "--platform", device, "--od", tmpDirectoryPath, };
             await _buildLogger.ExecuteWithLoggingAsync(emConfigExecutable, emConfigArguments, rtlDirectoryPath);
-            File.Copy(Path.Combine(tmpDirectoryPath, "emconfig.json"), "emconfig.json");
+            Copy(Path.Combine(tmpDirectoryPath, "emconfig.json"), "emconfig.json", overwrite: false);
             ProgressMajor("Emulation configuration (emconfig) setup is finished.");
         }
     }
@@ -401,8 +401,8 @@ private void CopyBinaries(
         if (binaryDirectoryPath != null) EnsureDirectoryExists(binaryDirectoryPath);
 
         var builtFilePath = Path.Combine(GetTmpDirectoryPath(hashId), $"hastip.{target}.xclbin");
-        File.Copy(builtFilePath, binaryPath);
-        File.Copy(builtFilePath + InfoFileExtension, binaryPath + InfoFileExtension);
+        Copy(builtFilePath, binaryPath, overwrite: true);
+        Copy(builtFilePath + InfoFileExtension, binaryPath + InfoFileExtension, overwrite: true);
         if (disableHbm) File.Create(binaryPath + NoHbmFlagExtension).Dispose();
         ProgressMajor($"Files copied to binary folder ({builtFilePath}).");
     }
@@ -427,7 +427,7 @@ private async Task CollectReportsAsync(
         var reportFiles = Directory.GetFiles(reportPath, "*.rpt");
         foreach (var reportFile in reportFiles)
         {
-            File.Copy(reportFile, Path.Combine(reportSavePath, Path.GetFileName(reportFile)));
+            Copy(reportFile, Path.Combine(reportSavePath, Path.GetFileName(reportFile)), overwrite: true);
         }
 
         var reportFilePath =
@@ -635,7 +635,7 @@ private static async Task ApplyTemplatesAsync(
             if (file.EndsWith(".template", StringComparison.OrdinalIgnoreCase)) continue;
 
             var targetFilePath = Path.Combine(targetDirectoryPath, "IP", Path.GetFileName(file));
-            if (!File.Exists(targetFilePath)) File.Copy(file, targetFilePath);
+            Copy(file, targetFilePath, overwrite: false);
         }
     }
 
@@ -686,4 +686,15 @@ private static string GetXilinxDirectoryPathOrThrow()
 
         return xilinxDirectoryPath;
     }
+
+    private static void Copy(string from, string to, bool overwrite)
+    {
+        ArgumentNullException.ThrowIfNull(from);
+        ArgumentNullException.ThrowIfNull(to);
+
+        if (overwrite || !File.Exists(to))
+        {
+            File.Copy(from, to, overwrite: true);
+        }
+    }
 }
diff --git a/src/Hastlayer/Hast.Xilinx/Drivers/AzureAlveoU250Driver.cs b/src/Hastlayer/Hast.Xilinx/Drivers/AzureAlveoU250Driver.cs
@@ -1,4 +1,6 @@
+using Hast.Layer;
 using Hast.Synthesis.Services;
+using System;
 
 namespace Hast.Xilinx.Drivers;
 
@@ -13,6 +15,10 @@ public class AzureAlveoU250Driver : VitisDeviceDriverBase
     protected override string TimingReportFileName => nameof(AlveoU250Driver);
 
     public AzureAlveoU250Driver(ITimingReportParser timingReportParser)
-        : base(timingReportParser)
-    { }
+        : base(timingReportParser) =>
+        _deviceManifest = new Lazy<IDeviceManifest>(() => InitializeManifest(new AzureNpDeviceManifest
+        {
+            SupportsHbm = false,
+            RequiresDcpBinary = true,
+        }));
 }
diff --git a/src/Hastlayer/Hast.Xilinx/Drivers/VitisDeviceDriverBase.cs b/src/Hastlayer/Hast.Xilinx/Drivers/VitisDeviceDriverBase.cs
@@ -15,17 +15,21 @@ public abstract class VitisDeviceDriverBase : DeviceDriverBase
 
     protected VitisDeviceDriverBase(ITimingReportParser timingReportParser)
         : base(timingReportParser) =>
-        _deviceManifest = new Lazy<IDeviceManifest>(() => new VitisDeviceManifest
-        {
-            Name = DeviceName,
-            ClockFrequencyHz = ClockFrequencyMhz * Mhz,
-            SupportedCommunicationChannelNames = new[] { Constants.VitisCommunicationChannelName },
-            // While there is much more DDR RAM on the device, the max object size in .NET is 2GB. So until we add
-            // paging to SimpleMemory the limit is 2GB, see: https://github.com/Lombiq/Hastlayer-SDK/issues/27
-            AvailableMemoryBytes = 2 * GigaByte,
-            SupportedPlatforms = string.IsNullOrEmpty(PlatformName) ? Array.Empty<string>() : new[] { PlatformName },
-        });
+        _deviceManifest = new Lazy<IDeviceManifest>(() => InitializeManifest(new VitisDeviceManifest()));
 
     public override void ConfigureMemory(MemoryConfiguration memory, IHardwareGenerationConfiguration hardwareGeneration) =>
         MemoryConfigurationHelper.ConfigureMemoryForVitis(memory, hardwareGeneration);
+
+    protected IDeviceManifest InitializeManifest(VitisDeviceManifest manifest)
+    {
+        manifest.Name = DeviceName;
+        manifest.ClockFrequencyHz = ClockFrequencyMhz * Mhz;
+        manifest.SupportedCommunicationChannelNames = new[] { Constants.VitisCommunicationChannelName };
+        // While there is much more DDR RAM on the device, the max object size in .NET is 2GB. So until we add
+        // paging to SimpleMemory the limit is 2GB, see: https://github.com/Lombiq/Hastlayer-SDK/issues/27
+        manifest.AvailableMemoryBytes = 2 * GigaByte;
+        manifest.SupportedPlatforms = string.IsNullOrEmpty(PlatformName) ? Array.Empty<string>() : new[] { PlatformName };
+
+        return manifest;
+    }
 }
diff --git a/src/Libraries/External/Lombiq.HelpfulLibraries b/src/Libraries/External/Lombiq.HelpfulLibraries
diff --git a/src/Samples/Hast.Samples.SampleAssembly/Hast.Samples.SampleAssembly.csproj b/src/Samples/Hast.Samples.SampleAssembly/Hast.Samples.SampleAssembly.csproj
@@ -12,11 +12,11 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(SolutionName) == 'Hastlayer.SDK.NuGet'">
-    <PackageReference Include="Hast.Algorithms" Version="2.1.1-alpha.0.hast-321" />
-    <PackageReference Include="Hast.Layer" Version="2.1.1-alpha.0.hast-321" />
+    <PackageReference Include="Hast.Algorithms" Version="2.1.1-alpha.0.hast-314" />
+    <PackageReference Include="Hast.Layer" Version="2.1.1-alpha.0.hast-314" />
     <PackageReference Include="Lombiq.Arithmetics" Version="0.0.1-alpha.3.hast-175" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Hast.Vitis.HardwareFramework" Version="1.2.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />